packages: automake/automake-info.patch, automake/automake-no_versioned_dir....
arekm
arekm at pld-linux.org
Sun May 17 22:36:18 CEST 2009
Author: arekm Date: Sun May 17 20:36:18 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.11
---- Files affected:
packages/automake:
automake-info.patch (1.16 -> 1.17) , automake-no_versioned_dir.patch (1.6 -> 1.7) , automake.spec (1.131 -> 1.132) , automake-depout.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/automake/automake-info.patch
diff -u packages/automake/automake-info.patch:1.16 packages/automake/automake-info.patch:1.17
--- packages/automake/automake-info.patch:1.16 Thu Oct 26 23:07:25 2006
+++ packages/automake/automake-info.patch Sun May 17 22:36:12 2009
@@ -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 at 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
================================================================
Index: packages/automake/automake-no_versioned_dir.patch
diff -u packages/automake/automake-no_versioned_dir.patch:1.6 packages/automake/automake-no_versioned_dir.patch:1.7
--- packages/automake/automake-no_versioned_dir.patch:1.6 Thu Oct 26 23:07:25 2006
+++ packages/automake/automake-no_versioned_dir.patch Sun May 17 22:36:12 2009
@@ -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 at -@APIVERSION@';
+our $libdir = '@datadir@/@PACKAGE@';
+ our $perl_threads = @PERL_THREADS@;
1;;
-
================================================================
Index: packages/automake/automake.spec
diff -u packages/automake/automake.spec:1.131 packages/automake/automake.spec:1.132
--- packages/automake/automake.spec:1.131 Sat Dec 27 12:19:03 2008
+++ packages/automake/automake.spec Sun May 17 22:36:12 2009
@@ -15,24 +15,23 @@
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
@@ -99,7 +98,6 @@
%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)
@@ -178,6 +176,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.132 2009/05/17 20:36:12 arekm
+- up to 1.11
+
Revision 1.131 2008/12/27 11:19:03 qboosh
- added depout patch (fix for "nothing to shift" failure taken from git)
- release 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/automake/automake-info.patch?r1=1.16&r2=1.17&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/automake/automake-no_versioned_dir.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/automake/automake.spec?r1=1.131&r2=1.132&f=u
More information about the pld-cvs-commit
mailing list