rpms/gnome-common/devel automake-1.11.patch, NONE, 1.1 gnome-common.spec, 1.15, 1.16

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27709

Modified Files:
	gnome-common.spec 
Added Files:
	automake-1.11.patch 
Log Message:
support automake 1.11


automake-1.11.patch:

--- NEW FILE automake-1.11.patch ---
diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index ba61f82..940b7a8 100644
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -316,12 +316,13 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
 
 case $REQUIRED_AUTOMAKE_VERSION in
     1.4*) automake_progs="automake-1.4" ;;
-    1.5*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
-    1.6*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
-    1.7*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
-    1.8*) automake_progs="automake-1.10 automake-1.9 automake-1.8" ;;
-    1.9*) automake_progs="automake-1.10 automake-1.9" ;;
-    1.10*) automake_progs="automake-1.10" ;;
+    1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+    1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+    1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+    1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+    1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
+    1.10*) automake_progs="automake-1.11 automake-1.10" ;;
+    1.11*) automake_progs="automake-1.11" ;;
 esac
 version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"


Index: gnome-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-common/devel/gnome-common.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gnome-common.spec	29 Mar 2009 23:45:28 -0000	1.15
+++ gnome-common.spec	3 Jun 2009 17:34:19 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gnome-common
 Version:        2.26.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Useful things common to building gnome packages from scratch
 
 Group:          Development/Tools
@@ -10,6 +10,9 @@ URL:            http://developer.gnome.o
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# from upstream
+Patch0: automake-1.11.patch
+
 # Hmmm.... gnome-common needs all of these.  But it doesn't necessarily need
 # a particular version.  We could install automake14 and not automake, for
 # instance, and things would still work....  Is it better to drop requirements
@@ -32,6 +35,7 @@ a GNOME application.
 
 %prep
 %setup -q
+%patch0 -p1 -b .automake-1.11
 
 %build
 %configure
@@ -55,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %changelog
+* Wed Jun  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
+- Support automake 1.11
+
 * Sun Mar 29 2009  Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0