diff --git a/.gitignore b/.gitignore index 0be3e3e..f38d77a 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,14 @@ /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 +/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 diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 1498601..a3ace29 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20220424 +Version: 20230504 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 @@ -12,6 +12,9 @@ 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 @@ -26,10 +29,12 @@ installation on Fedora systems. %prep %setup -q -sed -r -i 's/env python/env python3/' keyringctl %build +%check +make check + %install %make_install PREFIX=%{_prefix} mkdir -p %{buildroot}%{_keyringsdir}/ @@ -38,6 +43,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 08872ed..29fd354 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20220424.tar.gz) = 13482d662428cda32dafb6273c1ad87fdb9b667d113e33343f6daddaa4be28890088105a4e23eaa0794bbc8cdb5a66fcdebdb79fa7af8186650ea5c9397c4ebc +SHA512 (archlinux-keyring-20230504.tar.gz) = 0551fc3c1f395d3bc6e64ad402b4eaf87ca9dada52fb2d11bc46a62af458048071716fac9a207908041ea48fc44546e48ce02e6cc0b38bac17ee19dbfa34a6c6 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