From eb4cccf2339cf8f222c27eec1113e94278e148ec Mon Sep 17 00:00:00 2001 From: David King Date: Feb 24 2015 12:41:36 +0000 Subject: Merge branch 'master' into epel7 --- diff --git a/.gitignore b/.gitignore index 151b8dd..3f47dbf 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /autoconf-archive-2012.09.08.tar.xz /autoconf-archive-2014.02.28.tar.xz /autoconf-archive-2015.02.04.tar.xz +/autoconf-archive-2015.02.24.tar.xz diff --git a/autoconf-archive.spec b/autoconf-archive.spec index 3e09b0f..ad83121 100644 --- a/autoconf-archive.spec +++ b/autoconf-archive.spec @@ -1,10 +1,12 @@ +%{!?_licensedir:%global license %%doc} + Name: autoconf-archive -Version: 2015.02.04 +Version: 2015.02.24 Release: 1%{?dist} Summary: The Autoconf Macro Archive License: GPLv3+ with exceptions URL: http://www.gnu.org/software/autoconf-archive/ -Source0: http://ftp.gnu.org/gnu/autoconf-archive/%{name}-%{version}.tar.xz +Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz BuildArch: noarch Requires: autoconf Requires(post): info @@ -38,11 +40,16 @@ if [ $1 = 0 ]; then fi %files -%doc AUTHORS COPYING* NEWS README TODO +%doc AUTHORS NEWS README TODO +%license COPYING* %{_datadir}/aclocal/*.m4 %{_infodir}/autoconf-archive.info* %changelog +* Tue Feb 24 2015 David King - 2015.02.24-1 +- Update to 2015.02.24 +- Use license macro for COPYING* + * Mon Feb 09 2015 Christopher Meng - 2015.02.04-1 - Update to 2015.02.04 diff --git a/sources b/sources index fb6515d..59abfbf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c572eef518493b283cdc776f91804e76 autoconf-archive-2015.02.04.tar.xz +686ece8b7db6897d9bb9db1723e419b4 autoconf-archive-2015.02.24.tar.xz