packages: automake/automake-info.patch, automake/automake.spec, automake/au...
qboosh
qboosh at pld-linux.org
Thu Feb 2 17:21:40 CET 2012
Author: qboosh Date: Thu Feb 2 16:21:40 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.11.3
- updated info patch
- removed obsolete git patch
---- Files affected:
packages/automake:
automake-info.patch (1.18 -> 1.19) , automake.spec (1.147 -> 1.148) , automake-git.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/automake/automake-info.patch
diff -u packages/automake/automake-info.patch:1.18 packages/automake/automake-info.patch:1.19
--- packages/automake/automake-info.patch:1.18 Mon Dec 26 08:42:12 2011
+++ packages/automake/automake-info.patch Thu Feb 2 17:21:35 2012
@@ -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
+
- at dircategory Software development
+ at dircategory Programming tools:
@direntry
@@ -12,76 +12,83 @@
-
- at dircategory Individual utilities
- at 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 @@
- @file{true-true.o}. (The name of the object files rarely matters.)
+@@ -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.)
-- at node Invoking Automake
+- at node automake Invocation
+ at 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
-
-- at node Invoking aclocal
+- at node aclocal Invocation
+ at 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 at 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
+- at option{-Wportability} (@pxref{automake Invocation}). On the rare
++ at 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
================================================================
Index: packages/automake/automake.spec
diff -u packages/automake/automake.spec:1.147 packages/automake/automake.spec:1.148
--- packages/automake/automake.spec:1.147 Sat Jan 7 18:25:30 2012
+++ packages/automake/automake.spec Thu Feb 2 17:21:35 2012
@@ -15,28 +15,30 @@
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)
@@ -107,7 +109,6 @@
%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)
@@ -194,6 +195,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.148 2012/02/02 16:21:35 qboosh
+- updated to 1.11.3
+- updated info patch
+- removed obsolete git patch
+
Revision 1.147 2012/01/07 17:25:30 arekm
- rel 2; install: pkglibexec_SCRIPTS is a valid prefix/primary combination
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/automake/automake-info.patch?r1=1.18&r2=1.19&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/automake/automake.spec?r1=1.147&r2=1.148&f=u
More information about the pld-cvs-commit
mailing list