diff --git a/automake-1.13.4.tar.xz b/automake-1.13.4.tar.xz deleted file mode 100644 index e88fd82..0000000 --- a/automake-1.13.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89ce4933f59b8f0c20115c39cfe450a595cca74ede27b6881e88ec27720d1d66 -size 1449608 diff --git a/automake-1.14.1.tar.xz b/automake-1.14.1.tar.xz new file mode 100644 index 0000000..664c91f --- /dev/null +++ b/automake-1.14.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9b4f04b8b69cac2e832a38a718943aa976dbdad0097211f8b3448afdacf0669 +size 1488984 diff --git a/automake-1.14.1.tar.xz.sig b/automake-1.14.1.tar.xz.sig new file mode 100644 index 0000000..218165d --- /dev/null +++ b/automake-1.14.1.tar.xz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.15 (GNU/Linux) + +iQIcBAABAgAGBQJSuYwUAAoJEPyBjhdCn5bq+YoP/3Mfg1rZyZk3ZvN7i3z1NBgy +rv24o5Nbe76w3x9tijsrWcpNYa5yKjX7TYVkBTxG+OvoCN/ehcuCTsefAeTrpY37 +AVaOhsp2WEHtg+iGfSWqMKAORn2JBqPAtcU9wn4eaorl41+T//Ds0pHP2jUZsfRs +hw3dbhLCv41qzT/7hqk1KUmuDYz8A3lUaIhpkj7oIc7lwAcqbO62e6UH+DXMr0gg +AnPIW6CKg3cFpBDVl80XybzMVcqhb/QzhnofCw5yB0s0tW5bdPyoaO27HCoBxNal +7eABHtQrbXlZeNNQNGtDdZqzkPt/hwbTlraAkqed3xg1yYGkpKeeyfeeLhgRz7/X +4QJd70iXS3KmVrmoAhe69sOlOR0JRtoiZts/MCKNN0cR/USmAsTHi4ovIKDxluU3 +/gixFadgqwA3ZLdUiNjgFaRTJOEX0gCGSygJWwoTGS8bDcs27SanXJ7zzs6pmG2R +TSbWm9j7FoBqA7gdRPmESVRNUvmNhB7STNhRz1Ia9bYo7qEM7oB66oSqr9Q4Ehee +S18hSVIoN09b/nPXJPMHq9NxzCcPbhGrMeFMZpP3e5jNT2mo9pQVSFSUn1nlL1Aj +yya6JpAEMHq++S/N+wXtQvjK3sq3U6wOSDiO/2JNfpynyssr+U5U3cr13CPzN8gc ++Ywgvm6rTrvZtX2R8yOS +=eTWq +-----END PGP SIGNATURE----- diff --git a/automake-require_file.patch b/automake-require_file.patch index 928845a..d5cb6a0 100644 --- a/automake-require_file.patch +++ b/automake-require_file.patch @@ -4,8 +4,8 @@ Index: automake.in =================================================================== ---- automake.in.orig 2013-06-03 16:18:00.000000000 +0200 -+++ automake.in 2013-06-12 15:04:11.772901297 +0200 +--- bin/automake.in.orig 2013-06-03 16:18:00.000000000 +0200 ++++ bin/automake.in 2013-06-12 15:04:11.772901297 +0200 @@ -7489,12 +7489,14 @@ sub required_file_check_or_copy ($$$) my $fullfile = "$dir/$file"; my $found_it = 0; diff --git a/automake-testsuite.changes b/automake-testsuite.changes index cdb54c1..191cfa9 100644 --- a/automake-testsuite.changes +++ b/automake-testsuite.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Feb 5 14:47:23 UTC 2014 - jengelh@inai.de + +- Update to new upstream release 1.14.1 +* The 'compile' script is now unconditionally required for all + packages that perform C compilation +* The AM_PROG_CC_C_O macro can still be called, albeit that + should no longer be necessary. +* The special Automake-time substitutions '%reldir%' and + '%canon_reldir%' (and their short versions, '%D%' and '%C%' + respectively) can now be used in an included Makefile fragment. + The former is substituted with the relative directory of the + included fragment (compared to the top-level including + Makefile), and the latter with the canonicalized version of the + same relative directory. +* The 'shar' and 'compress' distribution formats are deprecated + ------------------------------------------------------------------- Tue Oct 29 11:36:10 UTC 2013 - fcrozat@suse.com diff --git a/automake-testsuite.spec b/automake-testsuite.spec index c42b698..4154c79 100644 --- a/automake-testsuite.spec +++ b/automake-testsuite.spec @@ -1,7 +1,7 @@ # # spec file for package automake-testsuite # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,6 +21,21 @@ # aren't updated. Name: automake-testsuite +Version: 1.14.1 +Release: 0 +Summary: A Program for Automatically Generating GNU-Style Makefile.in Files +License: GPL-2.0+ +Group: Development/Tools/Building +Url: http://www.gnu.org/software/automake + +Source: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz +Source2: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig +Source3: automake-rpmlintrc +Patch2: automake-require_file.patch +Patch3: automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch +Patch100: automake-SuSE.patch +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.69 BuildRequires: bison BuildRequires: gcc-c++ @@ -36,19 +51,6 @@ Requires: expect %endif Requires: autoconf >= 2.69 Requires: info -Version: 1.13.4 -Release: 0 -Summary: A Program for Automatically Generating GNU-Style Makefile.in Files -License: GPL-2.0+ -Group: Development/Tools/Building -Url: http://www.gnu.org/software/automake -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz -Source1: automake-rpmlintrc -Patch2: automake-require_file.patch -Patch3: automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch -Patch100: automake-SuSE.patch -BuildArch: noarch %description Automake is a tool for automatically generating "Makefile.in" files @@ -57,7 +59,7 @@ definitions (with rules occasionally thrown in). The generated "Makefile.in" files are compatible with the GNU Makefile standards. %prep -%setup -q -n automake-%{version} +%setup -q %patch2 %patch3 -p1 %patch100 diff --git a/automake.changes b/automake.changes index cdb54c1..191cfa9 100644 --- a/automake.changes +++ b/automake.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Feb 5 14:47:23 UTC 2014 - jengelh@inai.de + +- Update to new upstream release 1.14.1 +* The 'compile' script is now unconditionally required for all + packages that perform C compilation +* The AM_PROG_CC_C_O macro can still be called, albeit that + should no longer be necessary. +* The special Automake-time substitutions '%reldir%' and + '%canon_reldir%' (and their short versions, '%D%' and '%C%' + respectively) can now be used in an included Makefile fragment. + The former is substituted with the relative directory of the + included fragment (compared to the top-level including + Makefile), and the latter with the canonicalized version of the + same relative directory. +* The 'shar' and 'compress' distribution formats are deprecated + ------------------------------------------------------------------- Tue Oct 29 11:36:10 UTC 2013 - fcrozat@suse.com diff --git a/automake.spec b/automake.spec index a822df4..eea015d 100644 --- a/automake.spec +++ b/automake.spec @@ -1,7 +1,7 @@ # # spec file for package automake # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,6 +21,21 @@ # aren't updated. Name: automake +Version: 1.14.1 +Release: 0 +Summary: A Program for Automatically Generating GNU-Style Makefile.in Files +License: GPL-2.0+ +Group: Development/Tools/Building +Url: http://www.gnu.org/software/automake + +Source: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz +Source2: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig +Source3: automake-rpmlintrc +Patch2: automake-require_file.patch +Patch3: automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch +Patch100: automake-SuSE.patch +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.69 BuildRequires: bison BuildRequires: gcc-c++ @@ -36,19 +51,6 @@ Requires: expect %endif Requires: autoconf >= 2.69 Requires: info -Version: 1.13.4 -Release: 0 -Summary: A Program for Automatically Generating GNU-Style Makefile.in Files -License: GPL-2.0+ -Group: Development/Tools/Building -Url: http://www.gnu.org/software/automake -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz -Source1: automake-rpmlintrc -Patch2: automake-require_file.patch -Patch3: automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch -Patch100: automake-SuSE.patch -BuildArch: noarch %description Automake is a tool for automatically generating "Makefile.in" files @@ -57,7 +59,7 @@ definitions (with rules occasionally thrown in). The generated "Makefile.in" files are compatible with the GNU Makefile standards. %prep -%setup -q -n automake-%{version} +%setup -q %patch2 %patch3 -p1 %patch100