diff --git a/.gitignore b/.gitignore index fd98441..02acdfb 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /archlinux-keyring-20140220.tar.gz /archlinux-keyring-20140908.tar.gz /archlinux-keyring-20141218.tar.gz +/archlinux-keyring-20150212.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 912352b..ffb4bbd 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20141218 +Version: 20150212 Release: 1%{?dist} Url: https://projects.archlinux.org/archlinux-keyring.git/ Source0: https://projects.archlinux.org/%{name}.git/snapshot/%{name}-%{version}.tar.gz @@ -35,6 +35,9 @@ ln -s %{_datadir}/pacman/keyrings/archlinux.gpg %{buildroot}%{_keyringsdir}/ %{_keyringsdir}/archlinux.gpg %changelog +* Sat Feb 14 2015 Zbigniew Jędrzejewski-Szmek - 20150212-1 +- New upstream release (#1192336). + * Wed Dec 24 2014 Zbigniew Jędrzejewski-Szmek - 20141218-1 - New upstream release (#1176858). diff --git a/sources b/sources index 3531f07..36a79ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -015b62f21c6338cbf2e41c2a61831b58 archlinux-keyring-20141218.tar.gz +1a877c928c5a9e60bce5504768461044 archlinux-keyring-20150212.tar.gz diff --git a/version-update.sh b/version-update.sh index 45acb39..e2ab684 100755 --- a/version-update.sh +++ b/version-update.sh @@ -5,6 +5,7 @@ set -ex version="$1" bug="$2" +args="$3" ts="$(date '+%a %b %d %Y') $(git config user.name) <$(git config user.email)>" sed -i "s/%changelog/%changelog\n* $ts - $version-1\n- New upstream release (#$bug).\n/" *.spec @@ -12,10 +13,13 @@ sed -i -r "s/(^Version: *) .+/\1 $version/" *.spec sed -i -r "s/(^Release: *) [0-9]+/\1 1/" *.spec spectool -g *.spec fedpkg local -for url in $(spectool -l -S *.spec | awk '{print $2}'); do - fedpkg new-sources "${url##*/}" -done +spectool -l -S *.spec | awk '{print $2}' | sed s:.*/:: | xargs fedpkg new-sources git add *.spec git commit -a -m "Upstream release $version" -git push -fedpkg build + +GIT_DIR=archlinux-keyring/.git git tag --verify "$version" + +if [ "$args" = "-u" ]; then + git push + fedpkg build +fi