- rel 2; install: pkglibexec_SCRIPTS is a valid prefix/primary combination

Changed files:
    automake-git.patch -> 1.1
    automake.spec -> 1.147

diff --git a/automake-git.patch b/automake-git.patch
new file mode 100644 (file)
index 0000000..573e8ef
--- /dev/null
+++ b/automake-git.patch
@@ -0,0 +1,119 @@
+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.spec b/automake.spec
index 5786b568aea5ede3aa07706f3363dd024fd8f590..0ea9799e16868026b6c98aa7b98ea94cdd01385e 100644 (file)
--- a/automake.spec
+++ b/automake.spec
@@ -15,7 +15,7 @@ Summary(tr.UTF-8):    Makefile yapılandırma araçları
 Summary(uk.UTF-8):     GNU automake - інструменти для автоматичної генерації Makefile'ів
 Name:          automake
 Version:       1.11.2
-Release:       1
+Release:       2
 Epoch:         1
 License:       GPL v2+
 Group:         Development/Building
@@ -25,6 +25,7 @@ Patch0:               %{name}-info.patch
 Patch1:                %{name}-man.patch
 Patch2:                %{name}-no_versioned_dir.patch
 Patch3:                %{name}-morearchs.patch
+Patch4:                %{name}-git.patch
 URL:           http://sources.redhat.com/automake/
 %if %{with bootstrap}
 BuildRequires: autoconf >= 2.63
@@ -105,6 +106,7 @@ 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)