diff --git a/.gitignore b/.gitignore index 5834b13..9455464 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,9 @@ /archlinux-keyring-20210818.tar.gz /archlinux-keyring-20210902.tar.gz /archlinux-keyring-20211028.tar.gz +/archlinux-keyring-20220424.tar.gz +/archlinux-keyring-20220727.tar.gz +/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 08ad606..6074d1a 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20211028 +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 @@ -10,6 +10,11 @@ BuildArch: noarch BuildRequires: keyrings-filesystem BuildRequires: make +BuildRequires: /usr/bin/sq +BuildRequires: python3 +BuildRequires: systemd-rpm-macros +BuildRequires: systemd +BuildRequires: pkgconf Requires: pacman-filesystem Requires: keyrings-filesystem @@ -35,6 +40,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 234929b..c38e7e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20211028.tar.gz) = cec7954af337662c29b104bbfb4f30eb4df4d00c3c6ee9fad75a4deb9f8a4ed1bfd9b05c1d9a8bc7ba9c9518d7bb61cfda15a1dc96b3efb6ee5cf83cf4e8af9c +SHA512 (archlinux-keyring-20221123.tar.gz) = cdc2bf8ac6aa3c6003ada96c1b1bfad3ef7de4cec36ad9a2c690a8d0ea460a5b7b0382285526dd401de1f8e47f7986f1816c1c51d07a99e6bfa1bcf516467a84 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