From 4c6f17dbbba6850896a72ec163ce9d6ba87db574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 25 Oct 2017 18:25:44 +0200 Subject: [PATCH 1/2] Upstream release 20171020 --- .gitignore | 1 + archlinux-keyring.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8c94a19..77edd2c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /archlinux-keyring-20161101.tar.gz /archlinux-keyring-20161201.tar.gz /archlinux-keyring-20170611.tar.gz +/archlinux-keyring-20171020.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index f1dce35..07826ab 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20170611 +Version: 20171020 Release: 1%{?dist} Url: https://projects.archlinux.org/archlinux-keyring.git/ Source0: https://projects.archlinux.org/%{name}.git/snapshot/%{name}-%{version}.tar.gz @@ -38,6 +38,9 @@ ln -s %{_datadir}/pacman/keyrings/archlinux.gpg %{buildroot}%{_keyringsdir}/ %{_keyringsdir}/archlinux.gpg %changelog +* Wed Oct 25 2017 Zbigniew Jędrzejewski-Szmek - 20171020-1 +- New upstream release (#1484591). + * Mon Jun 12 2017 Zbigniew Jędrzejewski-Szmek - 20170611-1 - New upstream release (#1434187). diff --git a/sources b/sources index 907d8bb..8af44a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20170611.tar.gz) = b93964412857e00eef947c08576a5d42646084a7290dfb6d1bb5f4a0059e3248d382d3796c024224b950f8a4b4ab1d321656ae7c686f590baf83994e497a0e79 +SHA512 (archlinux-keyring-20171020.tar.gz) = 32d06e6f24e57c726d1559ea8b1fd8754e5ef0f8f40d2fcf11883917c4e6d190a181e3b7111a44dd30116cdf43e17d0ea454b8ac682885ab251c9bb19bd1f67f From 389e5925493af6068298a8964d39b09d07d7e904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 8 Jan 2018 18:29:48 +0100 Subject: [PATCH 2/2] Upstream release 20180108 --- .gitignore | 1 + archlinux-keyring.spec | 5 ++++- sources | 2 +- version-update.sh | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 77edd2c..bda4bc6 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /archlinux-keyring-20161201.tar.gz /archlinux-keyring-20170611.tar.gz /archlinux-keyring-20171020.tar.gz +/archlinux-keyring-20180108.tar.gz diff --git a/archlinux-keyring.spec b/archlinux-keyring.spec index 07826ab..f26bd31 100644 --- a/archlinux-keyring.spec +++ b/archlinux-keyring.spec @@ -1,5 +1,5 @@ Name: archlinux-keyring -Version: 20171020 +Version: 20180108 Release: 1%{?dist} Url: https://projects.archlinux.org/archlinux-keyring.git/ Source0: https://projects.archlinux.org/%{name}.git/snapshot/%{name}-%{version}.tar.gz @@ -38,6 +38,9 @@ ln -s %{_datadir}/pacman/keyrings/archlinux.gpg %{buildroot}%{_keyringsdir}/ %{_keyringsdir}/archlinux.gpg %changelog +* Mon Jan 08 2018 Zbigniew Jędrzejewski-Szmek - 20180108-1 +- New upstream release (#1484591). + * Wed Oct 25 2017 Zbigniew Jędrzejewski-Szmek - 20171020-1 - New upstream release (#1484591). diff --git a/sources b/sources index 8af44a9..12adab9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (archlinux-keyring-20171020.tar.gz) = 32d06e6f24e57c726d1559ea8b1fd8754e5ef0f8f40d2fcf11883917c4e6d190a181e3b7111a44dd30116cdf43e17d0ea454b8ac682885ab251c9bb19bd1f67f +SHA512 (archlinux-keyring-20180108.tar.gz) = 1d357eada13462d6ac91c418339733ddaff4cf36f882455b3ea19cc587a05f95bebce2fc03893405e6c629cd820cf0f9162ba5ddbe3f231c788c0bf2ec5b16d3 diff --git a/version-update.sh b/version-update.sh index 32a414b..34701b4 100755 --- a/version-update.sh +++ b/version-update.sh @@ -18,7 +18,7 @@ git add *.spec git commit -a -m "Upstream release $version" if [ -d "archlinux-keyring" ]; then - GIT_DIR=archlinux-keyring/.git git pull + (cd archlinux-keyring && git pull) else git clone https://projects.archlinux.org/archlinux-keyring.git/ fi