From cde1037685566110bd135f0711e9f0c6f0418756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 13 Jun 2022 20:33:16 +0200 Subject: [PATCH 01/10] Version 20220424 --- .gitignore | 1 + archlinux-keyring.spec | 3 ++- sources | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5834b13..0be3e3e 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /archlinux-keyring-20210818.tar.gz /archlinux-keyring-20210902.tar.gz /archlinux-keyring-20211028.tar.gz +/archlinux-keyring-20220424.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 08ad606..02de3e2 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20211028 +Version: 20220424 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 @@ -10,6 +10,7 @@ BuildArch: noarch BuildRequires: keyrings-filesystem BuildRequires: make +BuildRequires: /usr/bin/sq Requires: pacman-filesystem Requires: keyrings-filesystem diff --git a/sources b/sources index 234929b..08872ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20211028.tar.gz) = cec7954af337662c29b104bbfb4f30eb4df4d00c3c6ee9fad75a4deb9f8a4ed1bfd9b05c1d9a8bc7ba9c9518d7bb61cfda15a1dc96b3efb6ee5cf83cf4e8af9c +SHA512 (archlinux-keyring-20220424.tar.gz) = 13482d662428cda32dafb6273c1ad87fdb9b667d113e33343f6daddaa4be28890088105a4e23eaa0794bbc8cdb5a66fcdebdb79fa7af8186650ea5c9397c4ebc From e9a14eb7e7dbdc3fc14242e390811fcc8f5884de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 13 Jun 2022 23:42:50 +0200 Subject: [PATCH 02/10] Use python3 explicitly --- archlinux-keyring.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 02de3e2..1498601 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -11,6 +11,7 @@ BuildArch: noarch BuildRequires: keyrings-filesystem BuildRequires: make BuildRequires: /usr/bin/sq +BuildRequires: python3 Requires: pacman-filesystem Requires: keyrings-filesystem @@ -25,6 +26,7 @@ installation on Fedora systems. %prep %setup -q +sed -r -i 's/env python/env python3/' keyringctl %build From d1e91de9bfa4d0e63895d6f12e47193e89ed590c Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Wed, 27 Jul 2022 17:12:52 +0200 Subject: [PATCH 03/10] Version 20220727 (#2111589) --- .gitignore | 1 + archlinux-keyring.spec | 3 +-- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0be3e3e..16e7aca 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /archlinux-keyring-20210902.tar.gz /archlinux-keyring-20211028.tar.gz /archlinux-keyring-20220424.tar.gz +/archlinux-keyring-20220727.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 1498601..83d7c00 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20220424 +Version: 20220727 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 @@ -26,7 +26,6 @@ installation on Fedora systems. %prep %setup -q -sed -r -i 's/env python/env python3/' keyringctl %build diff --git a/sources b/sources index 08872ed..ad323d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20220424.tar.gz) = 13482d662428cda32dafb6273c1ad87fdb9b667d113e33343f6daddaa4be28890088105a4e23eaa0794bbc8cdb5a66fcdebdb79fa7af8186650ea5c9397c4ebc +SHA512 (archlinux-keyring-20220727.tar.gz) = 5780e5f69d049052f76f135debd99f4cda6b4a1c35156c594276cedf4cadfc95d746976b0ef497586fcbd4f128a438364daf08b0702b744d2aeb1ac0fdaaf7a2 From 954c7b4cfe1a66d5de6cc7abc2de79d6c1417bd3 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Thu, 1 Sep 2022 12:39:03 +0200 Subject: [PATCH 04/10] version-update: allow overriding the default FAS username --- version-update.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/version-update.sh b/version-update.sh index 2c30166..0f45f2d 100755 --- a/version-update.sh +++ b/version-update.sh @@ -9,8 +9,8 @@ bug="$2" args="$3" ts="$(date '+%a %b %d %Y') $(git config user.name) <$(git config user.email)>" -kinit -R zbyszek@FEDORAPROJECT.ORG - +kinit -R "${FAS:-zbyszek}@FEDORAPROJECT.ORG" + sed -i -r "s/(^Version: *) .+/\1 $version/" *.spec spectool -g *.spec : >sources @@ -34,7 +34,7 @@ fi git add *.spec git commit -a -m "Version $version (#$bug)" -if [ "$args" = "-u" ]; then +if [ "$args" = "-u" ]; then git push fedpkg build fi From 3f84bb2420eec649e967c991efcb00b2d40603b6 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Thu, 1 Sep 2022 12:54:05 +0200 Subject: [PATCH 05/10] Version 20220831 (#2122898) --- .gitignore | 1 + archlinux-keyring.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 16e7aca..2a9181e 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /archlinux-keyring-20211028.tar.gz /archlinux-keyring-20220424.tar.gz /archlinux-keyring-20220727.tar.gz +/archlinux-keyring-20220831.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 83d7c00..a4b2bfb 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20220727 +Version: 20220831 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 @@ -37,6 +37,9 @@ ln -s %{_datadir}/pacman/keyrings/archlinux.gpg %{buildroot}%{_keyringsdir}/ %files %{_datadir}/pacman/keyrings %{_keyringsdir}/archlinux.gpg +%{_bindir}/archlinux-keyring-wkd-sync +%{_unitdir}/archlinux-keyring-wkd-sync.* +%{_unitdir}/timers.target.wants/archlinux-keyring-wkd-sync.timer %changelog %autochangelog diff --git a/sources b/sources index ad323d2..14a7e86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20220727.tar.gz) = 5780e5f69d049052f76f135debd99f4cda6b4a1c35156c594276cedf4cadfc95d746976b0ef497586fcbd4f128a438364daf08b0702b744d2aeb1ac0fdaaf7a2 +SHA512 (archlinux-keyring-20220831.tar.gz) = e753914d0202ec96fc1c6978e8413f93999ca31e70594c42e1dd4c40c1e635208e61b5f32840bd5f1265503213784cb8eb3668464efe1fb477ed080be533b19e From 7b06bc8fdcafcd0d8a27c49054aa0600481bd0e0 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Thu, 1 Sep 2022 13:10:33 +0200 Subject: [PATCH 06/10] Build-require systemd-rpm-macros for %{_unitdir} Also, build-require pkgconf and systemd as well, since now the Makefile relies on systemd paths from pkgconf. --- archlinux-keyring.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index a4b2bfb..20891cf 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -12,6 +12,8 @@ BuildRequires: keyrings-filesystem BuildRequires: make BuildRequires: /usr/bin/sq BuildRequires: python3 +BuildRequires: systemd-rpm-macros +BuildRequires: pkgconf Requires: pacman-filesystem Requires: keyrings-filesystem From 300ea3eaf8f69f2630675ee696233a5726cffd0c Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Thu, 1 Sep 2022 13:28:34 +0200 Subject: [PATCH 07/10] Actually build-require systemd --- archlinux-keyring.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 20891cf..a9482e6 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -13,6 +13,7 @@ BuildRequires: make BuildRequires: /usr/bin/sq BuildRequires: python3 BuildRequires: systemd-rpm-macros +BuildRequires: systemd BuildRequires: pkgconf Requires: pacman-filesystem Requires: keyrings-filesystem From ac60ded94c9c8b919ae75e0b35f26863b93c58cf Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Fri, 30 Sep 2022 10:11:24 +0200 Subject: [PATCH 08/10] Version 20220927 (#2130137) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2a9181e..925a39d 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /archlinux-keyring-20220424.tar.gz /archlinux-keyring-20220727.tar.gz /archlinux-keyring-20220831.tar.gz +/archlinux-keyring-20220927.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index a9482e6..df062fc 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20220831 +Version: 20220927 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 14a7e86..386b9ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20220831.tar.gz) = e753914d0202ec96fc1c6978e8413f93999ca31e70594c42e1dd4c40c1e635208e61b5f32840bd5f1265503213784cb8eb3668464efe1fb477ed080be533b19e +SHA512 (archlinux-keyring-20220927.tar.gz) = aabe2da1177845e8bf2892cd2e701cceb187297771a32a24ba902f20bf61f212a8e9798f184cf978364ba81851de64512b27d22aeb50078e4f72366a126257ae From f41d7b7c22bb78fa0f01b747e693fa53d2c0970f Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Mon, 14 Nov 2022 19:52:59 +0100 Subject: [PATCH 09/10] Version 20221110 (#2141851) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 925a39d..111d7a5 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /archlinux-keyring-20220727.tar.gz /archlinux-keyring-20220831.tar.gz /archlinux-keyring-20220927.tar.gz +/archlinux-keyring-20221110.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index df062fc..fcb673a 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20220927 +Version: 20221110 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 386b9ff..0686577 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20220927.tar.gz) = aabe2da1177845e8bf2892cd2e701cceb187297771a32a24ba902f20bf61f212a8e9798f184cf978364ba81851de64512b27d22aeb50078e4f72366a126257ae +SHA512 (archlinux-keyring-20221110.tar.gz) = 4c99413eeac53e5475206bfd0a1c817b9721c4f878eadf44181deda6ef5198b49731ce58f923f195fb01236e40cd9156d9112574ce5b11fa3ed9165a85a4e6df From 90cdf11f2c2e235ede892631b3afe63dc163a3fb Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sat, 26 Nov 2022 20:57:08 +0100 Subject: [PATCH 10/10] Version 20221123 (#2145118) --- .gitignore | 1 + archlinux-keyring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 111d7a5..9455464 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /archlinux-keyring-20220831.tar.gz /archlinux-keyring-20220927.tar.gz /archlinux-keyring-20221110.tar.gz +/archlinux-keyring-20221123.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index fcb673a..6074d1a 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20221110 +Version: 20221123 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 0686577..c38e7e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20221110.tar.gz) = 4c99413eeac53e5475206bfd0a1c817b9721c4f878eadf44181deda6ef5198b49731ce58f923f195fb01236e40cd9156d9112574ce5b11fa3ed9165a85a4e6df +SHA512 (archlinux-keyring-20221123.tar.gz) = cdc2bf8ac6aa3c6003ada96c1b1bfad3ef7de4cec36ad9a2c690a8d0ea460a5b7b0382285526dd401de1f8e47f7986f1816c1c51d07a99e6bfa1bcf516467a84