- up to 1.11

Changed files:
    automake-depout.patch -> 1.2
    automake-info.patch -> 1.17
    automake-no_versioned_dir.patch -> 1.7
    automake.spec -> 1.132

diff --git a/automake-depout.patch b/automake-depout.patch
deleted file mode 100644 (file)
index df015cc..0000000
--- a/automake-depout.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- automake-1.10.2/m4/depout.m4.orig  2008-10-26 16:02:41.000000000 +0100
-+++ automake-1.10.2/m4/depout.m4       2008-12-27 11:47:51.502510478 +0100
-@@ -12,7 +12,8 @@
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[# Autoconf 2.62 quotes --file arguments for eval, but not when files
-+[{
-+# Autoconf 2.62 quotes --file arguments for eval, but not when files
- # are listed without --file.  Let's play safe and only enable the eval
- # if we detect the quoting.
- case $CONFIG_FILES in
-@@ -60,6 +61,7 @@
-     echo '# dummy' > "$dirpart/$file"
-   done
- done
-+}
- ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
- 
- 

diff --git a/automake-info.patch b/automake-info.patch
index 5f1dcd7a489eeef92c47a226a02e2567a42836f6..f09d2362f8f1fddbef3396c4d6ab526bddeb5acc 100644 (file)
--- a/automake-info.patch
+++ b/automake-info.patch
@@ -1,6 +1,6 @@
 --- automake-1.10/doc/automake.texi.orig       2006-10-15 19:41:24.000000000 +0200
 +++ automake-1.10/doc/automake.texi    2006-10-26 23:02:36.354332500 +0200
-@@ -35,15 +35,11 @@
+@@ -38,15 +38,11 @@
  @c info Automake  points to the Automake package's documentation
  @c info automake  points to the automake script's documentation
  @c (Autoconf has a similar setup.)
@@ -20,7 +20,7 @@
  @end direntry
  
  @titlepage
-@@ -94,7 +90,7 @@
+@@ -97,7 +93,7 @@
  * Autotools Introduction::      An Introduction to the Autotools
  * Generalities::                General ideas
  * Examples::                    Some example packages
@@ -29,7 +29,7 @@
  * configure::                   Scanning configure.ac or configure.in
  * Directories::                 Declaring subdirectories
  * Programs::                    Building programs and libraries
-@@ -170,7 +166,7 @@
+@@ -174,7 +170,7 @@
  
  * Requirements::                Configuration requirements
  * Optional::                    Other things Automake recognizes
@@ -38,7 +38,7 @@
  * Macros::                      Autoconf macros supplied with Automake
  
  Auto-generating aclocal.m4
-@@ -2297,7 +2293,7 @@
+@@ -2418,7 +2414,7 @@
  (The name of the object files rarely matters.)
  
  
@@ -47,7 +47,7 @@
  @chapter Creating a @file{Makefile.in}
  
  @cindex Multiple @file{configure.ac} files
-@@ -2520,7 +2516,7 @@
+@@ -2652,7 +2648,7 @@
  @menu
  * Requirements::                Configuration requirements
  * Optional::                    Other things Automake recognizes
@@ -56,7 +56,7 @@
  * Macros::                      Autoconf macros supplied with Automake
  @end menu
  
-@@ -2854,13 +2850,12 @@
+@@ -3020,13 +3016,12 @@
  @code{m4_include} is seldom used by @file{configure.ac} authors, but
  can appear in @file{aclocal.m4} when @command{aclocal} detects that
  some required macros come from files local to your package (as opposed
@@ -72,7 +72,7 @@
  @section Auto-generating aclocal.m4
  
  @cindex Invoking @command{aclocal}
-@@ -3028,7 +3023,7 @@
+@@ -3194,7 +3189,7 @@
  
  @vindex WARNINGS
  The environment variable @env{WARNINGS} is honored in the same
@@ -81,7 +81,7 @@
  
  @end table
  
-@@ -3302,12 +3297,12 @@
+@@ -3468,12 +3463,12 @@
  
  @code{ACLOCAL_AMFLAGS} contains options to pass to @command{aclocal}
  when @file{aclocal.m4} is to be rebuilt by @command{make}.  This line is
@@ -97,7 +97,7 @@
  @command{gettextize} Program, gettext, GNU gettext tools}) to locate
  the place where Gettext's macros should be installed.  So even if you
  do not really care about the rebuild rules, you should define
-@@ -5128,7 +5123,7 @@
+@@ -5314,7 +5309,7 @@
  passed to the tool invoked by @command{libtool} (hence the use of
  @samp{@var{library}_LDFLAGS} for libtool linking flags).  Generic
  options include @option{--tag=@var{TAG}} and @option{--silent}
@@ -106,7 +106,16 @@
  Libtool Manual} for more options) should appear before the mode
  selection on the command line; in @file{Makefile.am}s they should
  be listed in the @samp{@var{library}_LIBTOOLFLAGS} variable.
-@@ -8587,7 +8582,7 @@
+@@ -9151,7 +9146,7 @@
+ @command{make} implementations that do not support it.  The
+ @option{silent-rules} option turns off warnings about recursive variable
+ expansion, which are in turn enabled by @option{-Wportability}
+-(@pxref{Invoking Automake}).
++(@pxref{automake}).
+ 
+ @vindex @code{AM_V_GEN}
+ @vindex @code{AM_V_at}
+@@ -9292,7 +9287,7 @@
  @cindex Option, @option{-W@var{category}}
  @cindex Option, @option{--warnings=@var{category}}
  These options behave exactly like their command-line counterpart
@@ -115,16 +124,16 @@
  warning categories on a per-file basis.  You can also setup some warnings
  for your entire project; for instance, try @samp{AM_INIT_AUTOMAKE([-Wall])}
  in your @file{configure.ac}.
-@@ -9080,7 +9075,7 @@
+@@ -9840,7 +9835,7 @@
  settings of Automake, or replace some of its rules.  Overriding
  Automake rules is often inadvisable, particularly in the topmost
  directory of a package with subdirectories.  The @option{-Woverride}
--option (@pxref{Invoking Automake}) comes handy to catch overridden
-+option (@pxref{automake}) comes handy to catch overridden
+-option (@pxref{Invoking Automake}) comes in handy to catch overridden
++option (@pxref{automake}) comes in handy to catch overridden
  definitions.
  
- Note that Automake does not make any difference between rules with
-@@ -9518,7 +9513,7 @@
+ Note that Automake does not make any distinction between rules with
+@@ -10283,7 +10278,7 @@
  @end example
  
  The use of @option{--force-missing} ensures that auxiliary tools will be

diff --git a/automake-no_versioned_dir.patch b/automake-no_versioned_dir.patch
index 05b785a4582237fdc7993a97d6febb10907a3280..614bd188b044f90add1ecf60de28eda5347d5fbf 100644 (file)
--- a/automake-no_versioned_dir.patch
+++ b/automake-no_versioned_dir.patch
@@ -22,12 +22,12 @@
  
 --- automake-1.10/lib/Automake/Config.in.orig  2005-05-14 21:52:09.000000000 +0200
 +++ automake-1.10/lib/Automake/Config.in       2006-10-26 23:07:50.717979000 +0200
-@@ -30,7 +30,7 @@
+@@ -28,7 +28,7 @@
  our $APIVERSION = '@APIVERSION@';
  our $PACKAGE = '@PACKAGE@';
  our $VERSION = '@VERSION@';
 -our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
 +our $libdir = '@datadir@/@PACKAGE@';
+ our $perl_threads = @PERL_THREADS@;
  
  1;;
- 

diff --git a/automake.spec b/automake.spec
index 266bc21075c4f90620599184285f47ce2e68d2f6..90b38ea3577fd2005b1c2cc64ad46ce4c1d5d15f 100644 (file)
--- a/automake.spec
+++ b/automake.spec
@@ -14,24 +14,23 @@ Summary(ru.UTF-8):  GNU automake - инструменты для автомати
 Summary(tr.UTF-8):     Makefile yapılandırma araçları
 Summary(uk.UTF-8):     GNU automake - інструменти для автоматичної генерації Makefile'ів
 Name:          automake
-Version:       1.10.2
-Release:       2
+Version:       1.11
+Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         Development/Building
 Source0:       http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.bz2
-# Source0-md5: 1498208ab1c8393dcbd9afb7d06df6d5
+# Source0-md5: 4db4efe027e26b33930a7e151de19d0f
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-man.patch
 Patch2:                %{name}-no_versioned_dir.patch
 Patch3:                %{name}-morearchs.patch
-Patch4:                %{name}-depout.patch
 URL:           http://sources.redhat.com/automake/
 %if %{with regeneration}
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.8a
 %else
-BuildRequires: autoconf = 2.60
+BuildRequires: autoconf = 2.63
 %endif
 BuildRequires: rpm-perlprov
 BuildRequires: texinfo >= 4.7
@@ -98,7 +97,6 @@ Makefile'ів.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %if %{with regeneration}
 # prepare temporary copy of m4 dir without amversion.m4 (which causes automake version check)