rpms/automake15/devel automake15-versioning.patch, 1.1, 1.2 automake15.spec, 1.21, 1.22

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/automake15/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21781

Modified Files:
	automake15-versioning.patch automake15.spec 
Log Message:
fix license tag

automake15-versioning.patch:

Index: automake15-versioning.patch
===================================================================
RCS file: /cvs/pkgs/rpms/automake15/devel/automake15-versioning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- automake15-versioning.patch	9 Sep 2004 03:22:13 -0000	1.1
+++ automake15-versioning.patch	14 Jul 2008 19:18:58 -0000	1.2
@@ -1,24 +1,3 @@
-diff -u automake-1.5/configure.in~ automake-1.5/configure.in
---- automake-1.5/configure.in~	Wed Jan 23 15:38:15 2002
-+++ automake-1.5/configure.in	Wed Jan 23 15:38:15 2002
-@@ -5,6 +5,16 @@
- 
--AM_INIT_AUTOMAKE(automake, 1.5)
-+AM_INIT_AUTOMAKE(automake-1.5, 1.5)
- 
-+# 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/'`
-+AC_SUBST(APIVERSION)
-+
- ACLOCAL="`pwd`/aclocal --acdir=m4"
- # $AUTOMAKE is always run after a `cd $top_srcdir', hence `.' is really
- # what we want for perllibdir and libdir.
 diff -u automake-1.5/aclocal.in~ automake-1.5/aclocal.in
 --- automake-1.5/aclocal.in.versioning	Wed Jan 23 15:25:25 2002
 +++ automake-1.5/aclocal.in	Wed Jan 23 15:25:25 2002
@@ -105,3 +84,25 @@
  m4data_DATA = as.m4 auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \
  dmalloc.m4 error.m4 gcj.m4 header.m4 init.m4 install-sh.m4 lex.m4 \
  lispdir.m4 make.m4 maintainer.m4 minuso.m4 missing.m4 multi.m4 \
+diff -up automake-1.5/configure.in.orig automake-1.5/configure.in
+--- automake-1.5/configure.in.orig	2001-08-23 01:47:12.000000000 -0400
++++ automake-1.5/configure.in	2008-07-14 15:16:10.000000000 -0400
+@@ -3,7 +3,17 @@ AC_INIT(automake.in)
+ 
+ AC_CONFIG_AUX_DIR(lib)
+ 
+-AM_INIT_AUTOMAKE(automake, 1.5)
++AM_INIT_AUTOMAKE(automake-1.5, 1.5)
++
++# 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/'`
++AC_SUBST(APIVERSION)
+ 
+ ACLOCAL="`pwd`/aclocal --acdir=m4"
+ # $AUTOMAKE is always run after a `cd $top_srcdir', hence `.' is really


Index: automake15.spec
===================================================================
RCS file: /cvs/pkgs/rpms/automake15/devel/automake15.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- automake15.spec	5 Mar 2008 12:43:43 -0000	1.21
+++ automake15.spec	14 Jul 2008 19:18:59 -0000	1.22
@@ -1,8 +1,8 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake15
 Version:    1.5
-Release:    23
-License:    GPL
+Release:    24
+License:    GPLv2+
 Group:      Development/Tools
 URL:        http://sources.redhat.com/automake
 Source:     ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.gz
@@ -102,6 +102,10 @@
 %dir %{_datadir}/aclocal
 
 %changelog
+* Mon Jul 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-24
+- fix patch2 to apply with fuzz=0
+- fix license tag
+
 * Wed Mar 05 2008 Karsten Hopp <karsten at redhat.com> 1.5-23
 - fix source URL