packages: gnome-common/gnome-common.spec, gnome-common/gnome-common-automak...

[patrys]

Author: patrys                       Date: Fri May 29 15:51:05 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add support for automake 1.11
- rel 2

---- Files affected:
packages/gnome-common:
   gnome-common.spec (1.31 -> 1.32) , gnome-common-automake111.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gnome-common/gnome-common.spec
diff -u packages/gnome-common/gnome-common.spec:1.31 packages/gnome-common/gnome-common.spec:1.32
--- packages/gnome-common/gnome-common.spec:1.31	Thu Mar 19 22:24:25 2009
+++ packages/gnome-common/gnome-common.spec	Fri May 29 17:51:00 2009
@@ -4,13 +4,14 @@
 Summary(pl.UTF-8):	Wspólne makra przydatne do budowania pakietów GNOME
 Name:		gnome-common
 Version:	2.26.0
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-common/2.26/%{name}-%{version}.tar.bz2
 # Source0-md5:	196daa38cb21d91da1d6ec085f1e158b
 Patch0:		%{name}-omf.patch
 Patch1:		%{name}-docdir.patch
+Patch2:		%{name}-automake111.patch
 URL:		http://www.gnome.org/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1:1.9
@@ -32,6 +33,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}
@@ -63,6 +65,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2009/05/29 15:51:00  patrys
+- add support for automake 1.11
+- rel 2
+
 Revision 1.31  2009/03/19 21:24:25  megabajt
 - updated to 2.26.0
 

================================================================
Index: packages/gnome-common/gnome-common-automake111.patch
diff -u /dev/null packages/gnome-common/gnome-common-automake111.patch:1.1
--- /dev/null	Fri May 29 17:51:05 2009
+++ packages/gnome-common/gnome-common-automake111.patch	Fri May 29 17:51:00 2009
@@ -0,0 +1,36 @@
+From d0902887d6dac40dcc79f002a4bed2b492ad15d0 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe at gnome.org>
+Date: Mon, 18 May 2009 15:02:38 +0200
+Subject: [PATCH] Support for automake 1.11
+
+---
+ macros2/gnome-autogen.sh |   13 +++++++------
+ 1 files changed, 7 insertions(+), 6 deletions(-)
+
+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"
+-- 
+1.6.3.1
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-common/gnome-common.spec?r1=1.31&r2=1.32&f=u