diff --git a/.gitignore b/.gitignore index b66f9af..0c38a7c 100644 --- 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 diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index fc7bebc..b2367d4 100644 --- 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 diff --git a/sources b/sources index 22e6e3c..cb0a47e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20230130.tar.gz) = 3b11efad5566dcf338516badeceb3bdb95d12dc660705f0613a9a8c3e64cab9e599e4df64e3c70e094cadb80136890e51f56822c5edf23ad83e90fe703209983 +SHA512 (archlinux-keyring-20240427.tar.gz) = 05f61d6f6a4c2e2cc38fa030e37dd0b8e158171732901b08c51b7736f7797402065f778ddd5844dcc5e4595575c8a42b5801492c917825721d52b5f6ddfcc5cc 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