packages: automake/automake.spec, automake/automake-git.patch (NEW) - rel 2...
arekm
arekm at pld-linux.org
Sat Jan 7 18:25:35 CET 2012
Author: arekm Date: Sat Jan 7 17:25:35 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 2; install: pkglibexec_SCRIPTS is a valid prefix/primary combination
---- Files affected:
packages/automake:
automake.spec (1.146 -> 1.147) , automake-git.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/automake/automake.spec
diff -u packages/automake/automake.spec:1.146 packages/automake/automake.spec:1.147
--- packages/automake/automake.spec:1.146 Mon Dec 26 08:42:12 2011
+++ packages/automake/automake.spec Sat Jan 7 18:25:30 2012
@@ -16,7 +16,7 @@
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
@@ -26,6 +26,7 @@
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
@@ -106,6 +107,7 @@
%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)
@@ -192,6 +194,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.147 2012/01/07 17:25:30 arekm
+- rel 2; install: pkglibexec_SCRIPTS is a valid prefix/primary combination
+
Revision 1.146 2011/12/26 07:42:12 qboosh
- updated to 1.11.2
- updated info patch
================================================================
Index: packages/automake/automake-git.patch
diff -u /dev/null packages/automake/automake-git.patch:1.1
--- /dev/null Sat Jan 7 18:25:35 2012
+++ packages/automake/automake-git.patch Sat Jan 7 18:25:30 2012
@@ -0,0 +1,119 @@
+From 4e4dae500390d2ace681e4e4bc4c590ecdca38c6 Mon Sep 17 00:00:00 2001
+From: Stefano Lattarini <stefano.lattarini at 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 at davidpashley.com
+ David Zaroski cz253 at cleveland.Freenet.Edu
+ Dean Povey dpovey at wedgetail.com
+ Dennis J. Linse Dennis.J.Linse at SAIC.com
++Dennis Schridde devurandom at gmx.net
+ Derek R. Price derek.price at openavenue.com
+ Diab Jerius djerius at cfa.harvard.edu
+ Didier Cassirame faded at 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
++ at vindex pkglibexec_SCRIPTS
+ @vindex noinst_SCRIPTS
+ @vindex check_SCRIPTS
+
+ Scripts can be installed in @code{bindir}, @code{sbindir},
+- at code{libexecdir}, or @code{pkgdatadir}.
++ at 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
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/automake/automake.spec?r1=1.146&r2=1.147&f=u
More information about the pld-cvs-commit
mailing list