diff --git a/automake-1.11.5.tar.xz b/automake-1.11.5.tar.xz deleted file mode 100644 index f9499a2..0000000 --- a/automake-1.11.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:894b1fd7a18db868cefb5246e335a19f7cdb92297d20aeda356e921f0981f3a9 -size 1092140 diff --git a/automake-1.12.tar.xz b/automake-1.12.tar.xz new file mode 100644 index 0000000..09d743d --- /dev/null +++ b/automake-1.12.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f920cad2dc59f1be296b7d7584e3828a36154d16191f3cad60a73e6e9bcf879 +size 1331352 diff --git a/automake-require_file.patch b/automake-require_file.patch index 5c947d3..b79c4c8 100644 --- a/automake-require_file.patch +++ b/automake-require_file.patch @@ -1,20 +1,20 @@ Index: automake.in =================================================================== ---- automake.in.orig 2012-04-13 16:46:00.000000000 +0200 -+++ automake.in 2012-04-18 11:35:58.420388812 +0200 -@@ -7878,12 +7878,14 @@ sub require_file_internal ($$$@) - my $fullfile = "$dir/$file"; - my $found_it = 0; - my $dangling_sym = 0; -+ my $thisdir = dirname ($fullfile); -+ my $thisfile = basename ($fullfile); +--- automake.in.orig 2012-04-21 16:38:05.000000000 +0200 ++++ automake.in 2012-04-26 16:31:55.925021393 +0200 +@@ -7709,12 +7709,14 @@ sub required_file_check_or_copy ($$$) + my $fullfile = "$dir/$file"; + my $found_it = 0; + my $dangling_sym = 0; ++ my $thisdir = dirname ($fullfile); ++ my $thisfile = basename ($fullfile); - if (-l $fullfile && ! -f $fullfile) - { - $dangling_sym = 1; - } -- elsif (dir_has_case_matching_file ($dir, $file)) -+ elsif (dir_has_case_matching_file ($thisdir, $thisfile)) - { - $found_it = 1; - maybe_push_required_file ($dir, $file, $fullfile); + if (-l $fullfile && ! -f $fullfile) + { + $dangling_sym = 1; + } +- elsif (dir_has_case_matching_file ($dir, $file)) ++ elsif (dir_has_case_matching_file ($thisdir, $thisfile)) + { + $found_it = 1; + } diff --git a/automake-testsuite.changes b/automake-testsuite.changes index 474fc0e..c7e04fe 100644 --- a/automake-testsuite.changes +++ b/automake-testsuite.changes @@ -1,3 +1,76 @@ +------------------------------------------------------------------- +Thu Apr 26 16:32:56 CEST 2012 - pth@suse.de + +- Update to 1.12: + * Changes to Yacc and Lex support: + + - C source and header files derived from non-distributed Yacc + and/or Lex sources are now removed by a simple "make clean" + (while they were previously removed only by "make + maintainer-clean"). + + - Slightly backward-incompatible change, relevant only for use of + Yacc with C++: the extensions of the header files produced by the + Yacc rules are now modelled after the extension of the + corresponding sources. For example, yacc files named "foo.y++" + and "bar.yy" will produce header files named "foo.h++" and + "bar.hh" respectively, where they would have previously produced + header files named simply "foo.h" and "bar.h". This change + offers better compatibility with 'bison -o'. + + * Miscellaneous changes: + + - The AM_PROG_VALAC macro now causes configure to exit with status + 77, rather than 1, if the vala compiler found is too old. + + - The build system of Automake itself now avoids the use of make + recursion as much as possible. + + - Automake now prefers to quote 'like this' or "like this", rather + than `like this', in diagnostic message and generated Makefiles, + to accommodate the new GNU Coding Standards recommendations. + + - Automake has a new option '--print-libdir' that prints the path + of the directory containing the Automake-provided scripts and + data files. + + - The 'dist' and 'dist-all' targets now can run compressors in + - parallel. + + - The rules to create pdf, dvi and ps output from Texinfo files now + works better with modern 'texi2dvi' script, by explicitly passing + it the '--clean' option to ensure stray auxiliary files are not + left to clutter the build directory. + + - Automake can now generate silenced rules for texinfo outputs. + + - Some auxiliary files that are automatically distributed by + Automake (e.g., 'install-sh', or the 'depcomp' script for + packages compiling C sources) might now be listed in the + DIST_COMMON variable in many Makefile.in files, rather than in + the top-level one. + + - Messages of types warning or error from 'automake' and 'aclocal' + are now prefixed with the respective type, and presence of + -Werror is noted. + + - Automake's early configure-time sanity check now tries to avoid + sleeping for a second, which slowed down cached configure runs + noticeably. In that case, it will check back at the end of the + configure script to ensure that at least one second has passed, + to avoid time stamp issues with makefile rules rerunning + autotools programs. + + - The warnings in the category 'extra-portability' are now enabled + by '-Wall'. In previous versions, one has to use + '-Wextra-portability' to enable them. + + + - Various minor bugfixes for recent or long-standing bugs. + + For a more detailed list see the file NEWS in the package + documentation. + ------------------------------------------------------------------- Wed Apr 18 11:37:48 CEST 2012 - pth@suse.de diff --git a/automake-testsuite.spec b/automake-testsuite.spec index e6e0470..a1eea41 100644 --- a/automake-testsuite.spec +++ b/automake-testsuite.spec @@ -23,7 +23,7 @@ BuildRequires: help2man BuildRequires: xz Requires: autoconf >= 2.62 Requires: info -Version: 1.11.5 +Version: 1.12 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files License: GPL-2.0+ @@ -43,7 +43,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 %patch1 %patch3 diff --git a/automake.changes b/automake.changes index 474fc0e..c7e04fe 100644 --- a/automake.changes +++ b/automake.changes @@ -1,3 +1,76 @@ +------------------------------------------------------------------- +Thu Apr 26 16:32:56 CEST 2012 - pth@suse.de + +- Update to 1.12: + * Changes to Yacc and Lex support: + + - C source and header files derived from non-distributed Yacc + and/or Lex sources are now removed by a simple "make clean" + (while they were previously removed only by "make + maintainer-clean"). + + - Slightly backward-incompatible change, relevant only for use of + Yacc with C++: the extensions of the header files produced by the + Yacc rules are now modelled after the extension of the + corresponding sources. For example, yacc files named "foo.y++" + and "bar.yy" will produce header files named "foo.h++" and + "bar.hh" respectively, where they would have previously produced + header files named simply "foo.h" and "bar.h". This change + offers better compatibility with 'bison -o'. + + * Miscellaneous changes: + + - The AM_PROG_VALAC macro now causes configure to exit with status + 77, rather than 1, if the vala compiler found is too old. + + - The build system of Automake itself now avoids the use of make + recursion as much as possible. + + - Automake now prefers to quote 'like this' or "like this", rather + than `like this', in diagnostic message and generated Makefiles, + to accommodate the new GNU Coding Standards recommendations. + + - Automake has a new option '--print-libdir' that prints the path + of the directory containing the Automake-provided scripts and + data files. + + - The 'dist' and 'dist-all' targets now can run compressors in + - parallel. + + - The rules to create pdf, dvi and ps output from Texinfo files now + works better with modern 'texi2dvi' script, by explicitly passing + it the '--clean' option to ensure stray auxiliary files are not + left to clutter the build directory. + + - Automake can now generate silenced rules for texinfo outputs. + + - Some auxiliary files that are automatically distributed by + Automake (e.g., 'install-sh', or the 'depcomp' script for + packages compiling C sources) might now be listed in the + DIST_COMMON variable in many Makefile.in files, rather than in + the top-level one. + + - Messages of types warning or error from 'automake' and 'aclocal' + are now prefixed with the respective type, and presence of + -Werror is noted. + + - Automake's early configure-time sanity check now tries to avoid + sleeping for a second, which slowed down cached configure runs + noticeably. In that case, it will check back at the end of the + configure script to ensure that at least one second has passed, + to avoid time stamp issues with makefile rules rerunning + autotools programs. + + - The warnings in the category 'extra-portability' are now enabled + by '-Wall'. In previous versions, one has to use + '-Wextra-portability' to enable them. + + + - Various minor bugfixes for recent or long-standing bugs. + + For a more detailed list see the file NEWS in the package + documentation. + ------------------------------------------------------------------- Wed Apr 18 11:37:48 CEST 2012 - pth@suse.de diff --git a/automake.spec b/automake.spec index 97c273b..29ae203 100644 --- a/automake.spec +++ b/automake.spec @@ -19,11 +19,13 @@ Name: automake BuildRequires: autoconf BuildRequires: bison +BuildRequires: gcc-c++ +BuildRequires: gcc-fortran BuildRequires: help2man BuildRequires: xz Requires: autoconf >= 2.62 Requires: info -Version: 1.11.5 +Version: 1.12 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files License: GPL-2.0+ @@ -43,7 +45,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 %patch1 %patch3