diff --git a/.gitignore b/.gitignore index 6b0c65a..e27666f 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,18 @@ /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 +/archlinux-keyring-20240520.tar.gz +/archlinux-keyring-20240609.tar.gz +/archlinux-keyring-20240709.tar.gz +/archlinux-keyring-20241015.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 16f44e2..ffdb1de 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,11 +1,11 @@ Name: archlinux-keyring -Version: 20230704 +Version: 20241015 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 diff --git a/sources b/sources index 985d420..cb11c9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20230704.tar.gz) = b441f14217e000a0c9d892206ea64d414eaf0966c17133588a99b10fdf1da4cfd1a2b47d880aa05cb49211baaf3b7d333448903c1decdc0cc5c9dd89becf2480 +SHA512 (archlinux-keyring-20241015.tar.gz) = 9f042416951cee25cec65759fa2a9ea095cc5b8e650fc7dc070f0c319b50c8f082e45ef1cae6acb1350a0bd48112ee08283fc58c793c6e9c362b91bea42499e0 diff --git a/version-update.sh b/version-update.sh index 0f45f2d..dee64dc 100755 --- 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