- updated to 1.11.3

- updated info patch
- removed obsolete git patch

Changed files:
    automake-git.patch -> 1.2
    automake-info.patch -> 1.19
    automake.spec -> 1.148

diff --git a/automake-git.patch b/automake-git.patch
deleted file mode 100644 (file)
index 573e8ef..0000000
--- a/automake-git.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 4e4dae500390d2ace681e4e4bc4c590ecdca38c6 Mon Sep 17 00:00:00 2001
-From: Stefano Lattarini <stefano.lattarini@gmail.com>
-Date: Tue, 3 Jan 2012 09:06:09 +0100
-Subject: [PATCH] install: pkglibexec_SCRIPTS is a valid prefix/primary combination
-
-It makes little sense for `libexec_SCRIPTS' to be accepted as valid
-while `pkglibexec_SCRIPTS' is not.  So fix this inconsistency by
-explicitly allowing `pkglibexec_SCRIPTS' as well.  It is worth
-noting that the inconsistency has been there for a long time,
-but only the quite recent commit `v1.11-373-g9ca6326' "Warnings
-about primary/prefix mismatch fixed and extended" has made it
-noisy enough to be noticed.
-
-* automake.in (handle_scripts): Also list `pkglibexec' among the
-prefixes valid for the `SCRIPTS' primary.
-* doc/automake.texi (Scripts): Likewise.
-* tests/primary-prefix-valid-couples.test: Update.
-* THANKS: Likewise.
-* NEWS: Likewise.
-
-Reported by Dennis Schridde on the automake list:
-<http://lists.gnu.org/archive/html/automake/2012-01/msg00002.html>
----
- NEWS                                      |    5 +++++
- THANKS                                    |    1 +
- automake.in                               |    2 +-
- doc/automake.texi                         |    3 ++-
- tests/primary-prefix-invalid-couples.test |    2 +-
- tests/primary-prefix-valid-couples.test   |    2 +-
- 6 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 599f19f..2e572e4 100644
---- a/NEWS
-+++ b/NEWS
-@@ -82,6 +82,11 @@ New in 1.11.0a:
- 
- Bugs fixed in 1.11.0a:
- 
-+* Bugs introduced by 1.11.2:
-+
-+  - Automake now correctly recognizes the prefix/primary combination
-+   `pkglibexec_SCRIPTS' as valid.
-+
- * Bugs introduced by 1.11:
- 
-   - The `parallel-tests' test driver works around a GNU make 3.80 bug with
-diff --git a/THANKS b/THANKS
-index e9da06c..e9c6db8 100644
---- a/THANKS
-+++ b/THANKS
-@@ -78,6 +78,7 @@ David Pashley                david@davidpashley.com
- David Zaroski         cz253@cleveland.Freenet.Edu
- Dean Povey            dpovey@wedgetail.com
- Dennis J. Linse               Dennis.J.Linse@SAIC.com
-+Dennis Schridde               devurandom@gmx.net
- Derek R. Price                derek.price@openavenue.com
- Diab Jerius           djerius@cfa.harvard.edu
- Didier Cassirame      faded@free.fr
-diff --git a/automake.in b/automake.in
-index a852195..a689b63 100644
---- a/automake.in
-+++ b/automake.in
-@@ -3091,7 +3091,7 @@ sub handle_scripts
-     # useful to sometimes distribute scripts verbatim.  This happens
-     # e.g. in Automake itself.
-     &am_install_var ('-candist', 'scripts', 'SCRIPTS',
--                   'bin', 'sbin', 'libexec', 'pkgdata',
-+                   'bin', 'sbin', 'libexec', 'pkglibexec', 'pkgdata',
-                    'noinst', 'check');
- }
- 
-diff --git a/doc/automake.texi b/doc/automake.texi
-index cebe084..0c4dc01 100644
---- a/doc/automake.texi
-+++ b/doc/automake.texi
-@@ -7099,11 +7099,12 @@ prefix as with other primaries.
- @vindex sbin_SCRIPTS
- @vindex libexec_SCRIPTS
- @vindex pkgdata_SCRIPTS
-+@vindex pkglibexec_SCRIPTS
- @vindex noinst_SCRIPTS
- @vindex check_SCRIPTS
- 
- Scripts can be installed in @code{bindir}, @code{sbindir},
--@code{libexecdir}, or @code{pkgdatadir}.
-+@code{libexecdir}, @code{pkglibexecdir}, or @code{pkgdatadir}.
- 
- Scripts that need not be installed can be listed in
- @code{noinst_SCRIPTS}, and among them, those which are needed only by
-diff --git a/tests/primary-prefix-invalid-couples.test b/tests/primary-prefix-invalid-couples.test
-index 88e0817..c3d6471 100755
---- a/tests/primary-prefix-invalid-couples.test
-+++ b/tests/primary-prefix-invalid-couples.test
-@@ -79,7 +79,7 @@ for primary in $primaries; do
-       prefixes_ok='bin sbin libexec pkglibexec'
-       ;;
-     SCRIPTS)
--      prefixes_ok='bin sbin libexec pkgdata'
-+      prefixes_ok='bin sbin libexec pkglibexec pkgdata'
-       ;;
-     DATA)
-       prefixes_ok='data dataroot pkgdata doc html dvi pdf ps
-diff --git a/tests/primary-prefix-valid-couples.test b/tests/primary-prefix-valid-couples.test
-index 36ff5d8..6eb4149 100755
---- a/tests/primary-prefix-valid-couples.test
-+++ b/tests/primary-prefix-valid-couples.test
-@@ -57,7 +57,7 @@ for p in lib pkglib; do
-   echo "${p}_LTLIBRARIES = libd-$p.la" >> Makefile.am
- done
- 
--for p in bin sbin libexec pkgdata; do
-+for p in bin sbin libexec pkglibexec pkgdata; do
-   echo "${p}_SCRIPTS = $p.sh" >> Makefile.am
- done
- 
--- 
-1.7.2.5
-

diff --git a/automake-info.patch b/automake-info.patch
index 9547960f2238a32f2c695491e30642b5ee518b26..5882d5f9dc2d7c464f5f45a26125dfa0e22dbff4 100644 (file)
--- a/automake-info.patch
+++ b/automake-info.patch
@@ -1,9 +1,9 @@
---- automake-1.11.2/doc/automake.texi.orig     2011-12-21 20:53:41.000000000 +0100
-+++ automake-1.11.2/doc/automake.texi  2011-12-26 07:06:15.124722539 +0100
-@@ -41,15 +41,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.)
+--- automake-1.11.3/doc/automake.texi.orig     2012-02-01 11:40:23.000000000 +0100
++++ automake-1.11.3/doc/automake.texi  2012-02-02 17:12:44.575874589 +0100
+@@ -38,15 +38,11 @@
+ @end quotation
+ @end copying
+ 
 -@dircategory Software development
 +@dircategory Programming tools:
  @direntry
@@ -12,76 +12,83 @@
 -
 -@dircategory Individual utilities
 -@direntry
--* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
--* automake: (automake)Invoking Automake.        Generating Makefile.in.
-+* automake: (automake).                       Making GNU standards-compliant Makefiles
-+* aclocal: (automake)aclocal.         Generating aclocal.m4
-+* automake: (automake)automake.               Generating Makefile.in
+-* aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
+-* automake-invocation: (automake)automake Invocation. Generating Makefile.in.
++* Automake: (automake).                       Making GNU standards-compliant Makefiles
++* aclocal-invocation: (automake)aclocal.      Generating aclocal.m4
++* automake-invocation: (automake)automake.    Generating Makefile.in
  @end direntry
  
  @titlepage
-@@ -102,7 +98,7 @@
+@@ -99,7 +95,7 @@
  * Autotools Introduction::      An Introduction to the Autotools
  * Generalities::                General ideas
  * Examples::                    Some example packages
--* Invoking Automake::           Creating a Makefile.in
+-* automake Invocation::         Creating a Makefile.in
 +* automake::                    Creating a Makefile.in
  * configure::                   Scanning configure.ac, using aclocal
  * Directories::                 Declaring subdirectories
  * Programs::                    Building programs and libraries
-@@ -181,7 +177,7 @@
+@@ -178,7 +174,7 @@
  
  * Requirements::                Configuration requirements
  * Optional::                    Other things Automake recognizes
--* Invoking aclocal::            Auto-generating aclocal.m4
+-* aclocal Invocation::          Auto-generating aclocal.m4
 +* aclocal::                     Auto-generating aclocal.m4
  * Macros::                      Autoconf macros supplied with Automake
  
  Auto-generating aclocal.m4
-@@ -2504,7 +2500,7 @@
+@@ -1673,7 +1669,7 @@
+ When starting a new project, we suggest you start with such a simple
+ @file{configure.ac}, and gradually add the other tests it requires.
+ The command @command{autoscan} can also suggest a few of the tests
+-your package may need (@pxref{autoscan Invocation, , Using
++your package may need (@pxref{autoscan, , Using
+ @command{autoscan} to Create @file{configure.ac}, autoconf, The
+ Autoconf Manual}).
+ 
+@@ -2506,7 +2502,7 @@
+ would be chosen by automake; they would be @file{false-true.o} and
  @file{true-true.o}. (The name of the object files rarely matters.)
  
- 
--@node Invoking Automake
+-@node automake Invocation
 +@node automake
  @chapter Creating a @file{Makefile.in}
- 
- @cindex Multiple @file{configure.ac} files
-@@ -2749,7 +2745,7 @@
+ @c This node used to be named "Invoking automake".  This @anchor
+ @c allows old links to still work.
+@@ -2756,7 +2752,7 @@
  @menu
  * Requirements::                Configuration requirements
  * Optional::                    Other things Automake recognizes
--* Invoking aclocal::            Auto-generating aclocal.m4
+-* aclocal Invocation::          Auto-generating aclocal.m4
 +* aclocal::                     Auto-generating aclocal.m4
  * Macros::                      Autoconf macros supplied with Automake
  @end menu
  
-@@ -3120,13 +3116,12 @@
+@@ -3127,11 +3123,11 @@
  @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
--to macros installed in a system-wide directory, @pxref{Invoking
--aclocal}).
-+to macros installed in a system-wide directory, @pxref{aclocal}).
+ some required macros come from files local to your package (as opposed to
+-macros installed in a system-wide directory, @pxref{aclocal Invocation}).
++macros installed in a system-wide directory, @pxref{aclocal}).
  
  @end ftable
  
- 
--@node Invoking aclocal
+-@node aclocal Invocation
 +@node aclocal
  @section Auto-generating aclocal.m4
- 
- @cindex Invoking @command{aclocal}
-@@ -3309,7 +3304,7 @@
+ @c This node used to be named "Invoking automake".  This @anchor
+ @c allows old links to still work.
+@@ -3321,7 +3317,7 @@
  
  @vindex WARNINGS
  The environment variable @env{WARNINGS} is honored in the same
--way as it is for @command{automake} (@pxref{Invoking Automake}).
+-way as it is for @command{automake} (@pxref{automake Invocation}).
 +way as it is for @command{automake} (@pxref{automake}).
  
  @end table
  
-@@ -3617,12 +3612,12 @@
+@@ -3629,12 +3625,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 +104,16 @@
  @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
-@@ -5481,7 +5476,7 @@
+@@ -4092,7 +4088,7 @@
+ Although using some of the following macros was required in past
+ releases, you should not use any of them in new code.  Running
+ @command{autoupdate} should adjust your @file{configure.ac}
+-automatically (@pxref{autoupdate Invocation, , Using
++automatically (@pxref{autoupdate, , Using
+ @command{autoupdate} to Modernize @file{configure.ac}, autoconf, The
+ Autoconf Manual}).
+ 
+@@ -5506,7 +5502,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,38 +122,47 @@
  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.
-@@ -9551,7 +9546,7 @@
+@@ -5580,7 +5576,7 @@
+ Since Automake 1.6, it has been decided that running
+ @command{libtoolize} was none of Automake's business.  Instead, that
+ functionality has been moved into the @command{autoreconf} command
+-(@pxref{autoreconf Invocation, , Using @command{autoreconf}, autoconf,
++(@pxref{autoreconf, , Using @command{autoreconf}, autoconf,
+ The Autoconf Manual}).  If you do not want to remember what to run and
+ when, just learn the @command{autoreconf} command.  Hopefully,
+ replacing existing @file{bootstrap.sh} or @file{autogen.sh} scripts by
+@@ -9589,7 +9585,7 @@
  @cindex Option, @option{-W@var{category}}
  @cindex Option, @option{--warnings=@var{category}}
  These options behave exactly like their command-line counterpart
--(@pxref{Invoking Automake}).  This allows you to enable or disable some
+-(@pxref{automake Invocation}).  This allows you to enable or disable some
 +(@pxref{automake}).  This allows you to enable or disable some
  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}.
-@@ -10166,7 +10161,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}
-@@ -10386,7 +10381,7 @@
+@@ -10204,7 +10200,7 @@
+ that is not required by POSIX 2008 but is widely supported in
+ practice.  The @option{silent-rules} option thus turns off warnings
+ about recursive variable expansion, which are in turn enabled by
+-@option{-Wportability} (@pxref{automake Invocation}).  On the rare
++@option{-Wportability} (@pxref{automake}).  On the rare
+ @command{make} implementations that do not support nested variable
+ expansion, whether rules are silent is always determined at configure
+ time, and cannot be overridden at make time.  Future versions of POSIX
+@@ -10431,7 +10427,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 in handy to catch overridden
+-option (@pxref{automake Invocation}) comes in handy to catch overridden
 +option (@pxref{automake}) comes in handy to catch overridden
  definitions.
  
  Note that Automake does not make any distinction between rules with
-@@ -10834,7 +10829,7 @@
+@@ -10879,7 +10875,7 @@
  @end example
  
  The use of @option{--force-missing} ensures that auxiliary tools will be
--overridden by new versions (@pxref{Invoking Automake}).
+-overridden by new versions (@pxref{automake Invocation}).
 +overridden by new versions (@pxref{automake}).
  
  It is important to regenerate all these files each time Automake is

diff --git a/automake.spec b/automake.spec
index 0ea9799e16868026b6c98aa7b98ea94cdd01385e..cb5e73c1bb0644ab0ed676b9bc734477b3837d5a 100644 (file)
--- a/automake.spec
+++ b/automake.spec
@@ -14,28 +14,30 @@ 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.11.2
-Release:       2
+Version:       1.11.3
+Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         Development/Building
-Source0:       http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.bz2
-# Source0-md5: 18194e804d415767bae8f703c963d456
+Source0:       http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz
+# Source0-md5: 3d72b2076eb4397ad5e9a2aace6357fd
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-man.patch
 Patch2:                %{name}-no_versioned_dir.patch
 Patch3:                %{name}-morearchs.patch
-Patch4:                %{name}-git.patch
+#Patch4:               %{name}-git.patch
 URL:           http://sources.redhat.com/automake/
 %if %{with bootstrap}
-BuildRequires: autoconf >= 2.63
-%else
 BuildRequires: autoconf >= 2.62
+%else
+BuildRequires: autoconf >= 2.68
 BuildRequires: automake >= 1:1.10a
 %endif
 BuildRequires: help2man
 BuildRequires: rpm-perlprov
+BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo >= 4.7
+BuildRequires: xz
 Requires(pre): fileutils
 Requires:      filesystem >= 3.0-2
 Requires:      perl(File::Glob)
@@ -106,7 +108,6 @@ Makefile'ів.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %if %{without bootstrap}
 # prepare temporary copy of m4 dir without amversion.m4 (which causes automake version check)