- add support for automake 1.11

- rel 2

Changed files:
    gnome-common-automake111.patch -> 1.1
    gnome-common.spec -> 1.32

diff --git a/gnome-common-automake111.patch b/gnome-common-automake111.patch
new file mode 100644 (file)
index 0000000..2dfcb4a
--- /dev/null
+++ b/gnome-common-automake111.patch
@@ -0,0 +1,36 @@
+From d0902887d6dac40dcc79f002a4bed2b492ad15d0 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@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
+

diff --git a/gnome-common.spec b/gnome-common.spec
index a4ccb0693b87028e0a21ce13b855869cec510fa9..191908d2cdaffb12c1d944fb4c87a9ca232e9f82 100644 (file)
--- a/gnome-common.spec
+++ b/gnome-common.spec
@@ -3,13 +3,14 @@ Summary(es.UTF-8):    Macros comunes útiles para construir paquetes de GNOME
 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
@@ -31,6 +32,7 @@ Ten pakiet dostarcza makra do budowania pakietów GNOME.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}