diff --git a/.gitignore b/.gitignore index 7bd160e..17637d3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ automake-1.11.1.tar.bz2 /automake-1.11.3.tar.xz /automake-1.11.4.tar.xz /automake-1.11.5.tar.xz +/automake-1.12.2.tar.xz diff --git a/automake-1.11.3-checks.patch b/automake-1.11.3-checks.patch deleted file mode 100644 index 2264908..0000000 --- a/automake-1.11.3-checks.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up automake-1.11.3/tests/Makefile.in.kh automake-1.11.3/tests/Makefile.in ---- automake-1.11.3/tests/Makefile.in.kh 2012-02-03 11:58:51.000000000 +0100 -+++ automake-1.11.3/tests/Makefile.in 2012-02-03 11:58:28.000000000 +0100 -@@ -1206,7 +1206,6 @@ txinfo17.test \ - txinfo18.test \ - txinfo19.test \ - txinfo20.test \ --txinfo21.test \ - txinfo22.test \ - txinfo23.test \ - txinfo24.test \ diff --git a/automake-1.12.2-aclocal7-sleep.patch b/automake-1.12.2-aclocal7-sleep.patch new file mode 100644 index 0000000..a409af9 --- /dev/null +++ b/automake-1.12.2-aclocal7-sleep.patch @@ -0,0 +1,15 @@ +diff -up automake-1.12.2/t/aclocal7.sh.sleep automake-1.12.2/t/aclocal7.sh +--- automake-1.12.2/t/aclocal7.sh.sleep 2012-07-17 13:50:29.860646914 +0200 ++++ automake-1.12.2/t/aclocal7.sh 2012-07-17 13:55:56.752112356 +0200 +@@ -45,6 +45,11 @@ AUTOMAKE_after_aclocal () + $AUTOMAKE --no-force + } + ++# aclocal will rewrite aclocal.m4 unless the input files are all older than the ++# existing aclocal.m4 -- sleep to ensure somedefs.m4 has an older timestamp ++# than the aclocal.m4 that the next aclocal call will generate. ++$sleep ++ + $ACLOCAL -I m4 + AUTOMAKE_after_aclocal + diff --git a/automake.spec b/automake.spec index 3e90730..8605305 100644 --- a/automake.spec +++ b/automake.spec @@ -1,16 +1,16 @@ -%define api_version 1.11 +%define api_version 1.12 Summary: A GNU tool for automatically creating Makefiles Name: automake -Version: %{api_version}.5 +Version: %{api_version}.2 Release: 1%{?dist} License: GPLv2+ and GFDL Group: Development/Tools Source: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz -Patch0: automake-1.11.3-checks.patch -URL: http://sourceware.org/automake/ -Requires: autoconf >= 2.62 -Buildrequires: autoconf >= 2.62 +Patch0: automake-1.12.2-aclocal7-sleep.patch +URL: http://www.gnu.org/software/automake/ +Requires: autoconf >= 2.68 +Buildrequires: autoconf >= 2.68 Requires(post): /sbin/install-info Requires(preun): /sbin/install-info BuildArch: noarch @@ -41,7 +41,7 @@ Makefiles. %prep %setup -q -n automake-%{version} -#patch0 -p1 +%patch0 -p1 %build ./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ @@ -50,6 +50,9 @@ Makefiles. make %{?_smp_mflags} mv -f NEWS NEWS_ iconv -f ISO_8859-15 -t UTF-8 NEWS_ -o NEWS +cp m4/acdir/README README.aclocal +cp contrib/multilib/README README.multilib + %install rm -rf ${RPM_BUILD_ROOT} @@ -58,6 +61,7 @@ make install DESTDIR=${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir +rm -rf ${RPM_BUILD_ROOT}%{_datadir}/aclocal %check make check @@ -75,7 +79,7 @@ fi %files %defattr(-,root,root,-) -%doc AUTHORS README THANKS NEWS +%doc AUTHORS README THANKS NEWS README.aclocal README.multilib %{_bindir}/* %{_infodir}/*.info* %{_datadir}/automake-%{api_version} @@ -83,6 +87,9 @@ fi %{_mandir}/man1/* %changelog +* Tue Jul 17 2012 Karsten Hopp 1.12.2-1 +- automake-1.12.2 + * Mon Apr 16 2012 Karsten Hopp 1.11.5-1 - automake-1.11.5 diff --git a/sources b/sources index 2542141..8b7fd7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13f6a9522339ac0885110506cb7abad8 automake-1.11.5.tar.xz +56c3ab38a5ed8f2b825341b4e007372a automake-1.12.2.tar.xz