rpms/automake15/devel automake-1.5-noautotools.patch, NONE, 1.1 automake15.spec, 1.19, 1.20

Mon Apr 16 12:32:34 UTC 2007

Author: karsten

Update of /cvs/dist/rpms/automake15/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14493

Modified Files:
	automake15.spec 
Added Files:
	automake-1.5-noautotools.patch 
Log Message:
- update subdirs patch (#225299)
- don't run autotools during build



automake-1.5-noautotools.patch:
 Makefile.in              |    1 +
 configure                |   12 +++++++++++-
 lib/Automake/Makefile.in |    1 +
 lib/Makefile.in          |    1 +
 lib/am/Makefile.in       |    1 +
 5 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE automake-1.5-noautotools.patch ---
--- automake-1.5/lib/Automake/Makefile.in.noautotools	2007-04-16 13:49:31.000000000 +0200
+++ automake-1.5/lib/Automake/Makefile.in	2007-04-16 13:52:40.000000000 +0200
@@ -56,6 +56,7 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 AMTAR = @AMTAR@
+APIVERSION = @APIVERSION@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 EXEEXT = @EXEEXT@
--- automake-1.5/lib/Makefile.in.noautotools	2007-04-16 13:52:54.000000000 +0200
+++ automake-1.5/lib/Makefile.in	2007-04-16 13:53:10.000000000 +0200
@@ -56,6 +56,7 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 AMTAR = @AMTAR@
+APIVERSION = @APIVERSION@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 EXEEXT = @EXEEXT@
--- automake-1.5/lib/am/Makefile.in.noautotools	2007-04-16 13:53:23.000000000 +0200
+++ automake-1.5/lib/am/Makefile.in	2007-04-16 13:53:42.000000000 +0200
@@ -56,6 +56,7 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 AMTAR = @AMTAR@
+APIVERSION = @APIVERSION@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 EXEEXT = @EXEEXT@
--- automake-1.5/Makefile.in.noautotools	2007-04-16 13:48:43.000000000 +0200
+++ automake-1.5/Makefile.in	2007-04-16 13:49:13.000000000 +0200
@@ -56,6 +56,7 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 AMTAR = @AMTAR@
+APIVERSION = @APIVERSION@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 EXEEXT = @EXEEXT@
--- automake-1.5/configure.noautotools	2007-04-16 13:53:53.000000000 +0200
+++ automake-1.5/configure	2007-04-16 13:56:30.000000000 +0200
@@ -793,7 +793,7 @@
 fi
 
 # Define the identity of the package.
-PACKAGE=automake
+PACKAGE=automake15
 VERSION=1.5
 cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
@@ -842,6 +842,15 @@
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 
+# The API version is the base version.  We must guarantee
+# compatibility for all releases with the same API version.
+# Our current rule is that:
+# * All releases, including the prereleases, in an X.Y series
+#   are compatible.  So 1.5.1c is compatible with 1.5.
+# * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c
+#   aren't the same.
+APIVERSION=`echo "$VERSION" | sed -e 's/^\([[0-9]]*\.[[0-9]]*[[a-z]]?\).*$/\1/'`
+
 
 ACLOCAL="`pwd`/aclocal --acdir=m4"
 # $AUTOMAKE is always run after a `cd $top_srcdir', hence `.' is really
@@ -1064,6 +1073,7 @@
 s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%g
 s%@DEPDIR@%$DEPDIR%g
 s%@PERL@%$PERL%g
+s%@APIVERSION@%$APIVERSION%g
 
 CEOF
 EOF


Index: automake15.spec
===================================================================
RCS file: /cvs/dist/rpms/automake15/devel/automake15.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- automake15.spec	19 Mar 2007 11:06:07 -0000	1.19
+++ automake15.spec	16 Apr 2007 12:32:32 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake15
 Version:    1.5
-Release:    21
+Release:    22
 License:    GPL
 Group:      Development/Tools
 URL:        http://sources.redhat.com/automake
@@ -17,6 +17,7 @@
 Patch7:     automake-1.5-tailfix.patch
 Patch8:     automake-1.5-depconf2.patch
 Patch9:     automake-1.5-info.patch
+Patch10:    automake-1.5-noautotools.patch
 Buildrequires:  autoconf, bison, texinfo
 Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -52,10 +53,13 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1 -b .noautotools
 
 %build
 mv automake.texi automake15.texi
 rm -f automake.info*
+touch -r configure.noautotools configure
+touch -r configure.in.orig configure.in
 # patch 2 touches configure.in
 autoconf
 ./configure --program-suffix=-%{version} --prefix=%{_prefix} \
@@ -98,6 +102,10 @@
 %dir %{_datadir}/aclocal
 
 %changelog
+* Mon Apr 16 2007 Karsten Hopp <karsten at redhat.com> 1.5-22
+- update subdirs patch (#225299)
+- don't run autotools during build
+
 * Mon Mar 19 2007 Karsten Hopp <karsten at redhat.com> 1.5-21
 - remove erroneous provides (#224569)
 


