Version 20240427

... (rhbz#2277519) (cherry picked from commit 3b4e0b0d82) (cherry picked from commit e31a41046d) (cherry picked from commit 8f7071ab4a)
Drop now-needed patch for sequoia-sq
2024-04-28 20:54:33 +02:00 · 2024-04-28 20:54:32 +02:00 · 2024-03-20 18:03:35 +01:00 · 2024-02-09 12:59:14 +01:00 · 2024-02-09 12:59:14 +01:00 · 2024-01-03 10:26:28 +01:00
4 changed files with 34 additions and 10 deletions
--- a/.gitignore
+++ b/.gitignore
@ -38,3 +38,19 @@
 /archlinux-keyring-20221213.tar.gz
 /archlinux-keyring-20221220.tar.gz
 /archlinux-keyring-20230130.tar.gz
+/archlinux-keyring-20230225.tar.gz
+/archlinux-keyring-20230320.tar.gz
+/archlinux-keyring-20230504.tar.gz
+/archlinux-keyring-20230629.tar.gz
+/archlinux-keyring-20230704.tar.gz
+/archlinux-keyring-20230821.tar.gz
+/archlinux-keyring-20230918.tar.gz
+/archlinux-keyring-20231017.tar.gz
+/archlinux-keyring-20231026.tar.gz
+/archlinux-keyring-20231113.tar.gz
+/archlinux-keyring-20231130.tar.gz
+/archlinux-keyring-20231207.tar.gz
+/archlinux-keyring-20231222.tar.gz
+/archlinux-keyring-20240208.tar.gz
+/archlinux-keyring-20240313.tar.gz
+/archlinux-keyring-20240427.tar.gz
--- a/archlinux-keyring.spec
+++ b/archlinux-keyring.spec
@ -1,11 +1,11 @@
 Name:           archlinux-keyring
-Version:        20230130
+Version:        20240427
 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
 # see https://wiki.archlinux.org/index.php/Pacman-key for introduction
-License:        Public Domain
-Summary:        GPG keys used by Arch distribution to sign packages
+License:        LicenseRef-Fedora-Public-Domain
+Summary:        GPG keys used by Arch Linux distribution to sign packages
 BuildArch:      noarch

 BuildRequires:  keyrings-filesystem
@ -28,7 +28,7 @@ developers into an RPM package to allow for safe and convenient
 installation on Fedora systems.

 %prep
-%setup -q
+%autosetup -p1

 %build

@ -47,10 +47,16 @@ ln --relative -s %{_datadir}/pacman/keyrings/archlinux.gpg %{buildroot}%{_keyrin
 %{_unitdir}/archlinux-keyring-wkd-sync.*
 %{_unitdir}/timers.target.wants/archlinux-keyring-wkd-sync.timer

-%post
-if [ -x /usr/bin/pacman-key ] && /usr/bin/pacman-key -l &>/dev/null; then
-    /usr/bin/pacman-key --populate archlinux || :
-    /usr/bin/pacman-key --updatedb || :
+%posttrans
+if [ $1 == 1 ] && [ -x /usr/bin/pacman-key ] && ! /usr/bin/pacman-key -l &>/dev/null; then
+    /usr/bin/pacman-key --init && \
+    /usr/bin/pacman-key --populate archlinux --updatedb || :
+fi
+
+%transfiletriggerin -- /usr/bin/pacman-key
+if [ -x /usr/bin/pacman-key ] && ! /usr/bin/pacman-key -l &>/dev/null; then
+    /usr/bin/pacman-key --init && \
+    /usr/bin/pacman-key --populate archlinux --updatedb || :
 fi

 %changelog
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (archlinux-keyring-20230130.tar.gz) = 3b11efad5566dcf338516badeceb3bdb95d12dc660705f0613a9a8c3e64cab9e599e4df64e3c70e094cadb80136890e51f56822c5edf23ad83e90fe703209983
+SHA512 (archlinux-keyring-20240427.tar.gz) = 05f61d6f6a4c2e2cc38fa030e37dd0b8e158171732901b08c51b7736f7797402065f778ddd5844dcc5e4595575c8a42b5801492c917825721d52b5f6ddfcc5cc
--- a/version-update.sh
+++ b/version-update.sh
@ -32,7 +32,9 @@ if [ "$sum1" != "$sum2" ]; then
 fi

 git add *.spec
-git commit -a -m "Version $version (#$bug)"
+git commit -a -m "Version $version
+
+... (rhbz#$bug)"

 if [ "$args" = "-u" ]; then
    git push
Author	SHA1	Message	Date
Zbigniew Jędrzejewski-Szmek	018943fd34	Version 20240427 ... (rhbz#2277519) (cherry picked from commit `3b4e0b0d82`) (cherry picked from commit `e31a41046d`) (cherry picked from commit `8f7071ab4a`)	2024-04-28 20:54:33 +02:00
Zbigniew Jędrzejewski-Szmek	59e543343c	Drop now-needed patch for sequoia-sq [skip changelog] (cherry picked from commit `a88ca31402`) (cherry picked from commit `6594ae2daa`) (cherry picked from commit `8651fd252c`)	2024-04-28 20:54:32 +02:00
Frantisek Sumsal	ee834200c2	Version 20240313 ... (rhbz#2269408) This also reshuffles the patch situation a bit, notably: - the patch for sq-keyring-linter is no longer necessary, since we have sequoia-sq >= 0.31.0 in all active Fedora releases - a new patch was added that reverts [0], since ATTOW in Fedora we have sequoia-sq 0.33.0 which is from before the keyring module was moved into the toolbox one; once Fedora gets sequoia-sq >= 0.34.0 this patch can be dropped [0] `10252b287d`	2024-03-20 18:03:35 +01:00
Zbigniew Jędrzejewski-Szmek	19cf7b8231	Version 20240208 ... (rhbz#2263434) (cherry picked from commit `3e3512daed`) (cherry picked from commit `0edec7b972`)	2024-02-09 12:59:14 +01:00
Zbigniew Jędrzejewski-Szmek	8d08d211cf	Rework scriptlets to initialize the keyring The scriptlet would only work if pacman was already installed when the scriptlet was called. This would often be the case, but for example, the user might even install pacman later in a separate transaction. Let's switch to a %transfiletriggerin: this way we should be called in all cases where pacman-key is available. We might be called more often than necessary, but that should be fine too. pacman is updated rather rarely. (cherry picked from commit `9866da662c`) (cherry picked from commit `110405c15e`)	2024-02-09 12:59:14 +01:00
Frantisek Sumsal	dfcf786a29	Version 20231222 ... (rhbz#2255663)	2024-01-03 10:26:28 +01:00
Frantisek Sumsal	c349f63de4	Version 20231207 ... (rhbz#2253495)	2023-12-13 22:02:26 +01:00
Frantisek Sumsal	eb1ff1723f	Version 20231130 ... (rhbz#2252233)	2023-12-03 19:56:27 +01:00
Zbigniew Jędrzejewski-Szmek	f011f77610	Convert license tag to SPDX	2023-11-21 14:45:56 +01:00
Frantisek Sumsal	bb51aecb39	Version 20231113 ... (rhbz#2248590)	2023-11-14 20:01:13 +01:00
Frantisek Sumsal	6b7ebd5324	Version 20231026 ... (rhbz#2246326)	2023-11-03 19:09:22 +01:00
Zbigniew Jędrzejewski-Szmek	4c5722ada7	Version 20231017 ... (rhbz#2243196) (cherry picked from commit `08ca5376dd`) (cherry picked from commit `2a2d6fa476`)	2023-10-17 15:45:16 +02:00
Zbigniew Jędrzejewski-Szmek	26b2e08050	Version 20230918 ... (rhbz#2239389) (cherry picked from commit `8ecc997ae3`) (cherry picked from commit `f174f54bff`)	2023-09-18 18:46:24 +02:00
Zbigniew Jędrzejewski-Szmek	315aabbfd5	Use rhbz# in message This way bodhi should be able to link the update to the bug automatically. The bug number is moved from the git commit title to the body. We don't really need this clutter in the git log, it is only useful in the %changelog so that bodhi can pick it up. (cherry picked from commit `a71f4e415d`) (cherry picked from commit `9d835e0719`) [skip changelog]	2023-09-18 18:46:20 +02:00
Michel Lind	958345d0e8	Revert upstream feature that uses sq >= 0.31.0 Signed-off-by: Michel Lind <salimma@fedoraproject.org>	2023-09-07 14:23:18 -05:00
Frantisek Sumsal	302cff29e4	Version 20230821 (#2233045 )	2023-08-21 20:55:40 +02:00
Frantisek Sumsal	0454d657f7	Version 20230704 (#2219535 )	2023-07-09 23:03:42 +02:00
Frantisek Sumsal	e92f5785a3	Version 20230629 (#2218594 )	2023-07-01 09:56:09 +02:00
Frantisek Sumsal	1010da885e	Version 20230504 (#2193100 )	2023-05-08 21:42:14 +02:00
Frantisek Sumsal	53edcbfc0d	Version 20230320 (#2180086 )	2023-03-24 13:28:37 +01:00
Frantisek Sumsal	7d9302a621	Version 20230225 (#2172640 )	2023-02-28 20:24:54 +01:00