From 7c3f20c4f7e0eee6d3cd4c0e5dcd24f1052c4af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Feb 2021 10:00:04 +0100 Subject: [PATCH 1/5] Upstream release 20210110 --- .gitignore | 1 + archlinux-keyring.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 70c034e..d1b7d58 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /archlinux-keyring-20200422.tar.gz /archlinux-keyring-20200622.tar.gz /archlinux-keyring-20200817.tar.gz +/archlinux-keyring-20210110.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 84f016f..372caff 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20200817 +Version: 20210110 Release: 1%{?dist} Url: https://projects.archlinux.org/archlinux-keyring.git/ Source0: https://projects.archlinux.org/%{name}.git/snapshot/%{name}-%{version}.tar.gz @@ -9,6 +9,7 @@ Summary: GPG keys used by Arch distribution to sign packages BuildArch: noarch BuildRequires: keyrings-filesystem +BuildRequires: make Requires: pacman-filesystem Requires: keyrings-filesystem @@ -38,6 +39,9 @@ ln -s %{_datadir}/pacman/keyrings/archlinux.gpg %{buildroot}%{_keyringsdir}/ %{_keyringsdir}/archlinux.gpg %changelog +* Tue Feb 02 2021 Zbigniew Jędrzejewski-Szmek - 20210110-1 +- New upstream release (#1843508). + * Tue Aug 18 2020 Zbigniew Jędrzejewski-Szmek - 20200817-1 - New upstream release (#1843508). diff --git a/sources b/sources index e47de67..a8a643f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20200817.tar.gz) = b0325ef529ce5fb99ef9f4270802eeb8d0fc08ea47e7c9ae2c5885b7abb9d2dadf388a70e847ad7991f3d3c8e59d48385af4f1aeb6094adda31762f64f268830 +SHA512 (archlinux-keyring-20210110.tar.gz) = 19912c49447b55e9e3cf4269e3dd4326416c7f648c76246de65b843fffe9fb4858c133e2fe0769454fb9b31fe0a38606168cf8e3d9d8293c6af02f4d845d97d8 From 2c4c08a89b247bce141076d531e487bd616b7802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 2 Sep 2021 09:52:10 +0200 Subject: [PATCH 2/5] Convert to %autorelease and %autochangelog --- archlinux-keyring.spec | 124 +---------------------------------------- changelog | 121 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 122 deletions(-) create mode 100644 changelog diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 372caff..8ef34d6 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,6 +1,6 @@ Name: archlinux-keyring Version: 20210110 -Release: 1%{?dist} +Release: %autorelease Url: https://projects.archlinux.org/archlinux-keyring.git/ Source0: https://projects.archlinux.org/%{name}.git/snapshot/%{name}-%{version}.tar.gz # see https://wiki.archlinux.org/index.php/Pacman-key for introduction @@ -39,124 +39,4 @@ ln -s %{_datadir}/pacman/keyrings/archlinux.gpg %{buildroot}%{_keyringsdir}/ %{_keyringsdir}/archlinux.gpg %changelog -* Tue Feb 02 2021 Zbigniew Jędrzejewski-Szmek - 20210110-1 -- New upstream release (#1843508). - -* Tue Aug 18 2020 Zbigniew Jędrzejewski-Szmek - 20200817-1 -- New upstream release (#1843508). - -* Mon Jul 27 2020 Fedora Release Engineering - 20200622-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jun 25 2020 Zbigniew Jędrzejewski-Szmek - 20200622-1 -- New upstream release (#1843508). - -* Tue May 05 2020 Zbigniew Jędrzejewski-Szmek - 20200422-1 -- New upstream release (#1826747). - -* Tue Mar 31 2020 Zbigniew Jędrzejewski-Szmek - 20200108-1 -- New upstream release (#1785315). - -* Tue Jan 28 2020 Fedora Release Engineering - 20191219-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Dec 19 2019 Zbigniew Jędrzejewski-Szmek - 20191219-1 -- New upstream release (#1785315). - -* Sat Oct 19 2019 Zbigniew Jędrzejewski-Szmek - 20191018-1 -- New upstream release (#1747072). - -* Sat Aug 17 2019 Zbigniew Jędrzejewski-Szmek - 20190805-1 -- New upstream release (#1595225). - -* Wed Jul 24 2019 Fedora Release Engineering - 20181003-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 20181003-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Nov 26 2018 Zbigniew Jędrzejewski-Szmek - 20181003-1 -- New upstream release (#1595225). - -* Thu Jul 12 2018 Fedora Release Engineering - 20180404-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat Apr 14 2018 Zbigniew Jędrzejewski-Szmek - 20180404-1 -- New upstream release (#1550956). - -* Wed Feb 07 2018 Fedora Release Engineering - 20180108-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Jan 08 2018 Zbigniew Jędrzejewski-Szmek - 20180108-1 -- New upstream release (#1484591). - -* Wed Oct 25 2017 Zbigniew Jędrzejewski-Szmek - 20171020-1 -- New upstream release (#1484591). - -* Wed Jul 26 2017 Fedora Release Engineering - 20170611-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jun 12 2017 Zbigniew Jędrzejewski-Szmek - 20170611-1 -- New upstream release (#1434187). - -* Fri Feb 10 2017 Fedora Release Engineering - 20161201-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Dec 01 2016 Zbigniew Jędrzejewski-Szmek - 20161201-1 -- New upstream release (#1400727). - -* Tue Nov 01 2016 Zbigniew Jędrzejewski-Szmek - 20161101-1 -- New upstream release (#1323372). - -* Sun Mar 06 2016 Zbigniew Jędrzejewski-Szmek - 20160215-1 -- New upstream release (#1308758). - -* Wed Feb 03 2016 Zbigniew Jędrzejewski-Szmek - 20160123-1 -- New upstream release (#1293177). - -* Wed Feb 03 2016 Fedora Release Engineering - 20151206-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sun Dec 06 2015 Zbigniew Jędrzejewski-Szmek - 20151206-1 -- New upstream release (#1288831). - -* Wed Jul 22 2015 Zbigniew Jędrzejewski-Szmek - 20150605-1 -- New upstream release (#1221589). - -* Wed Jun 17 2015 Fedora Release Engineering - 20150212-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Feb 14 2015 Zbigniew Jędrzejewski-Szmek - 20150212-1 -- New upstream release (#1192336). - -* Wed Dec 24 2014 Zbigniew Jędrzejewski-Szmek - 20141218-1 -- New upstream release (#1176858). - -* Wed Sep 10 2014 Zbigniew Jędrzejewski-Szmek - 20140908-1 -- New upstream release (#1140086). - -* Sat Jun 07 2014 Fedora Release Engineering - 20140220-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Feb 21 2014 Zbigniew Jędrzejewski-Szmek - 20140220-1 -- New upstream release (#1067847). - -* Sun Jan 26 2014 Zbigniew Jędrzejewski-Szmek - 20140124-1 -- New upstream release (#1057981). - -* Thu Jan 09 2014 Zbigniew Jędrzejewski-Szmek - 20140108-1 -- New upstream release (#1050849). - -* Tue Oct 29 2013 Zbigniew Jędrzejewski-Szmek - 20131027-1 -- New upstream release (#1023895). - -* Sun Sep 29 2013 Zbigniew Jędrzejewski-Szmek - 20130926-1 -- New upstream release (#1013091). -- Provide links to the keyring files in /usr/share/keyrings. - -* Sun Aug 25 2013 Zbigniew Jędrzejewski-Szmek - 20130818-2 -- Add Url field and build section. -- Package accepted (#998690). - -* Mon Aug 19 2013 Zbigniew Jędrzejewski-Szmek - 20130818-1 -- Initial packaging. +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..243cfd2 --- /dev/null +++ b/changelog @@ -0,0 +1,121 @@ +* Tue Feb 02 2021 Zbigniew Jędrzejewski-Szmek - 20210110-1 +- New upstream release (#1843508). + +* Tue Aug 18 2020 Zbigniew Jędrzejewski-Szmek - 20200817-1 +- New upstream release (#1843508). + +* Mon Jul 27 2020 Fedora Release Engineering - 20200622-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jun 25 2020 Zbigniew Jędrzejewski-Szmek - 20200622-1 +- New upstream release (#1843508). + +* Tue May 05 2020 Zbigniew Jędrzejewski-Szmek - 20200422-1 +- New upstream release (#1826747). + +* Tue Mar 31 2020 Zbigniew Jędrzejewski-Szmek - 20200108-1 +- New upstream release (#1785315). + +* Tue Jan 28 2020 Fedora Release Engineering - 20191219-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Dec 19 2019 Zbigniew Jędrzejewski-Szmek - 20191219-1 +- New upstream release (#1785315). + +* Sat Oct 19 2019 Zbigniew Jędrzejewski-Szmek - 20191018-1 +- New upstream release (#1747072). + +* Sat Aug 17 2019 Zbigniew Jędrzejewski-Szmek - 20190805-1 +- New upstream release (#1595225). + +* Wed Jul 24 2019 Fedora Release Engineering - 20181003-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 20181003-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Nov 26 2018 Zbigniew Jędrzejewski-Szmek - 20181003-1 +- New upstream release (#1595225). + +* Thu Jul 12 2018 Fedora Release Engineering - 20180404-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sat Apr 14 2018 Zbigniew Jędrzejewski-Szmek - 20180404-1 +- New upstream release (#1550956). + +* Wed Feb 07 2018 Fedora Release Engineering - 20180108-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Jan 08 2018 Zbigniew Jędrzejewski-Szmek - 20180108-1 +- New upstream release (#1484591). + +* Wed Oct 25 2017 Zbigniew Jędrzejewski-Szmek - 20171020-1 +- New upstream release (#1484591). + +* Wed Jul 26 2017 Fedora Release Engineering - 20170611-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Jun 12 2017 Zbigniew Jędrzejewski-Szmek - 20170611-1 +- New upstream release (#1434187). + +* Fri Feb 10 2017 Fedora Release Engineering - 20161201-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Dec 01 2016 Zbigniew Jędrzejewski-Szmek - 20161201-1 +- New upstream release (#1400727). + +* Tue Nov 01 2016 Zbigniew Jędrzejewski-Szmek - 20161101-1 +- New upstream release (#1323372). + +* Sun Mar 06 2016 Zbigniew Jędrzejewski-Szmek - 20160215-1 +- New upstream release (#1308758). + +* Wed Feb 03 2016 Zbigniew Jędrzejewski-Szmek - 20160123-1 +- New upstream release (#1293177). + +* Wed Feb 03 2016 Fedora Release Engineering - 20151206-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sun Dec 06 2015 Zbigniew Jędrzejewski-Szmek - 20151206-1 +- New upstream release (#1288831). + +* Wed Jul 22 2015 Zbigniew Jędrzejewski-Szmek - 20150605-1 +- New upstream release (#1221589). + +* Wed Jun 17 2015 Fedora Release Engineering - 20150212-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Feb 14 2015 Zbigniew Jędrzejewski-Szmek - 20150212-1 +- New upstream release (#1192336). + +* Wed Dec 24 2014 Zbigniew Jędrzejewski-Szmek - 20141218-1 +- New upstream release (#1176858). + +* Wed Sep 10 2014 Zbigniew Jędrzejewski-Szmek - 20140908-1 +- New upstream release (#1140086). + +* Sat Jun 07 2014 Fedora Release Engineering - 20140220-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Feb 21 2014 Zbigniew Jędrzejewski-Szmek - 20140220-1 +- New upstream release (#1067847). + +* Sun Jan 26 2014 Zbigniew Jędrzejewski-Szmek - 20140124-1 +- New upstream release (#1057981). + +* Thu Jan 09 2014 Zbigniew Jędrzejewski-Szmek - 20140108-1 +- New upstream release (#1050849). + +* Tue Oct 29 2013 Zbigniew Jędrzejewski-Szmek - 20131027-1 +- New upstream release (#1023895). + +* Sun Sep 29 2013 Zbigniew Jędrzejewski-Szmek - 20130926-1 +- New upstream release (#1013091). +- Provide links to the keyring files in /usr/share/keyrings. + +* Sun Aug 25 2013 Zbigniew Jędrzejewski-Szmek - 20130818-2 +- Add Url field and build section. +- Package accepted (#998690). + +* Mon Aug 19 2013 Zbigniew Jędrzejewski-Szmek - 20130818-1 +- Initial packaging. From 406bb4d40caa5898681501692d81c9e19de04ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 2 Sep 2021 10:01:22 +0200 Subject: [PATCH 3/5] Version 20210818 (#1988670) --- .gitignore | 1 + archlinux-keyring.spec | 8 +++----- sources | 2 +- version-update.sh | 14 +++++++------- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index d1b7d58..9dd4c11 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /archlinux-keyring-20200622.tar.gz /archlinux-keyring-20200817.tar.gz /archlinux-keyring-20210110.tar.gz +/archlinux-keyring-20210818.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 8ef34d6..9421470 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,8 +1,8 @@ Name: archlinux-keyring -Version: 20210110 +Version: 20210818 Release: %autorelease -Url: https://projects.archlinux.org/archlinux-keyring.git/ -Source0: https://projects.archlinux.org/%{name}.git/snapshot/%{name}-%{version}.tar.gz +Url: https://archlinux.org/packages/core/any/archlinux-keyring/ +Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz # see https://wiki.archlinux.org/index.php/Pacman-key for introduction License: Public Domain Summary: GPG keys used by Arch distribution to sign packages @@ -25,10 +25,8 @@ installation on Fedora systems. %prep %setup -q - %build - %install %make_install PREFIX=%{_prefix} mkdir -p %{buildroot}%{_keyringsdir}/ diff --git a/sources b/sources index a8a643f..e6208a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20210110.tar.gz) = 19912c49447b55e9e3cf4269e3dd4326416c7f648c76246de65b843fffe9fb4858c133e2fe0769454fb9b31fe0a38606168cf8e3d9d8293c6af02f4d845d97d8 +SHA512 (archlinux-keyring-20210818.tar.gz) = a38d7e1ebb0183147094d42941aaf63437640bc70e7fcfc64877ad488aaee159500f18bf081c13042d663410949ff205ee250f81c55ecdc4e11904953d0ff3b7 diff --git a/version-update.sh b/version-update.sh index c6d125f..2c30166 100755 --- a/version-update.sh +++ b/version-update.sh @@ -2,6 +2,7 @@ LANG=C.utf8 set -ex +set -o pipefail version="$1" bug="$2" @@ -10,30 +11,29 @@ ts="$(date '+%a %b %d %Y') $(git config user.name) <$(git config user.email)>" kinit -R zbyszek@FEDORAPROJECT.ORG -sed -i "s/%changelog/%changelog\n* $ts - $version-1\n- New upstream release (#$bug).\n/" *.spec sed -i -r "s/(^Version: *) .+/\1 $version/" *.spec -sed -i -r "s/(^Release: *) [0-9]+/\1 1/" *.spec spectool -g *.spec : >sources fedpkg local spectool -l -S *.spec | awk '{print $2}' | sed s:.*/:: | xargs fedpkg new-sources -git add *.spec -git commit -a -m "Upstream release $version" if [ -d "archlinux-keyring" ]; then (cd archlinux-keyring && git pull) else - git clone https://projects.archlinux.org/archlinux-keyring.git/ + git clone https://gitlab.archlinux.org/archlinux/archlinux-keyring/ fi GIT_DIR=archlinux-keyring/.git git tag --verify "$version" -sum1=$(GIT_DIR=archlinux-keyring/.git git archive --prefix=archlinux-keyring-$version/ "$version"|md5sum -) -sum2=$(zcat archlinux-keyring-$version.tar.gz| md5sum -) +sum1=$(GIT_DIR=archlinux-keyring/.git git archive --prefix=archlinux-keyring-$version/ "$version" | sha512sum -) +sum2=$(zcat archlinux-keyring-$version.tar.gz | sha512sum -) if [ "$sum1" != "$sum2" ]; then echo "Checksums don't match!" exit 1 fi +git add *.spec +git commit -a -m "Version $version (#$bug)" + if [ "$args" = "-u" ]; then git push fedpkg build From 9c4a5af99a5ef7409f500cb3d910f2d5693256dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 3 Sep 2021 10:36:04 +0200 Subject: [PATCH 4/5] Version 20210902 (#2000773) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9dd4c11..94c5f1e 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /archlinux-keyring-20200817.tar.gz /archlinux-keyring-20210110.tar.gz /archlinux-keyring-20210818.tar.gz +/archlinux-keyring-20210902.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 9421470..cda305c 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20210818 +Version: 20210902 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index e6208a3..33b1c85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20210818.tar.gz) = a38d7e1ebb0183147094d42941aaf63437640bc70e7fcfc64877ad488aaee159500f18bf081c13042d663410949ff205ee250f81c55ecdc4e11904953d0ff3b7 +SHA512 (archlinux-keyring-20210902.tar.gz) = 1e8f529e187d174c00e8f1a0f595e9b82ec6b96b68f0b5b4cf1292446302c54b912de08397e5a74f40918752ea2d4674f1f4f7f9a96b74039333b76185a353ae From 9f9672a9ce30e14861c13e0ba00f6137f26063f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 5 Nov 2021 08:03:59 +0100 Subject: [PATCH 5/5] Version 20211028 (#2018137) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 94c5f1e..5834b13 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /archlinux-keyring-20210110.tar.gz /archlinux-keyring-20210818.tar.gz /archlinux-keyring-20210902.tar.gz +/archlinux-keyring-20211028.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index cda305c..08ad606 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20210902 +Version: 20211028 Release: %autorelease Url: https://archlinux.org/packages/core/any/archlinux-keyring/ Source0: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/archive/%{version}/archlinux-keyring-%{version}.tar.gz diff --git a/sources b/sources index 33b1c85..234929b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20210902.tar.gz) = 1e8f529e187d174c00e8f1a0f595e9b82ec6b96b68f0b5b4cf1292446302c54b912de08397e5a74f40918752ea2d4674f1f4f7f9a96b74039333b76185a353ae +SHA512 (archlinux-keyring-20211028.tar.gz) = cec7954af337662c29b104bbfb4f30eb4df4d00c3c6ee9fad75a4deb9f8a4ed1bfd9b05c1d9a8bc7ba9c9518d7bb61cfda15a1dc96b3efb6ee5cf83cf4e8af9c