[gnome-common] Backport patch for support of automake-1.12

[mkasik]

commit 31762328f860433dff817e1948c1b10aaef79e1a
Author: Marek Kasik <mkasik at redhat.com>
Date:   Thu Jul 19 10:52:25 2012 +0200

    Backport patch for support of automake-1.12

 gnome-common-automake-1.12.patch |   34 ++++++++++++++++++++++++++++++++++
 gnome-common.spec                |    7 ++++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/gnome-common-automake-1.12.patch b/gnome-common-automake-1.12.patch
new file mode 100644
index 0000000..0807ed2
--- /dev/null
+++ b/gnome-common-automake-1.12.patch
@@ -0,0 +1,34 @@
+commit 1fed4ee7015b89a1ac4c4a535aeb753e820e4970
+Author: Xiao-Long Chen <chenxiaolong at cxl.epac.to>
+Date:   Sun Apr 29 13:44:32 2012 -0400
+
+    Add support for automake 1.12
+    
+    Bug #675093.
+
+diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
+index 9967f89..3179c3f 100644
+--- a/macros2/gnome-autogen.sh
++++ b/macros2/gnome-autogen.sh
+@@ -325,13 +325,14 @@ 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.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" ;;
++    1.5*) automake_progs="automake-1.12 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.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
++    1.7*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
++    1.8*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
++    1.9*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
++    1.10*) automake_progs="automake-1.12 automake-1.11 automake-1.10" ;;
++    1.11*) automake_progs="automake-1.12 automake-1.11" ;;
++    1.12*) automake_progs="automake-1.12" ;;
+ esac
+ version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
+     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
diff --git a/gnome-common.spec b/gnome-common.spec
index 8e70470..f32ba6b 100644
--- a/gnome-common.spec
+++ b/gnome-common.spec
@@ -1,6 +1,6 @@
 Name:           gnome-common
 Version:        3.4.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Useful things common to building gnome packages from scratch
 
 Group:          Development/Tools
@@ -8,6 +8,7 @@ BuildArch:      noarch
 License:        GPLv3
 URL:            http://developer.gnome.org
 Source0:        http://download.gnome.org/sources/%{name}/3.4/%{name}-%{version}.tar.xz
+Patch0:         gnome-common-automake-1.12.patch
 
 # This will pull in the latest version; if your package requires something older,
 # well, BuildRequire it in that spec.  At least until such time as we have a
@@ -28,6 +29,7 @@ a GNOME application.
 
 %prep
 %setup -q
+%patch0 -p1 -b .automake-1.12
 
 %build
 %configure
@@ -46,6 +48,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %changelog
+* Thu Jul 19 2012 Marek Kasik <mkasik at redhat.com> - 3.4.0.1-3
+- Backport patch for support of automake-1.12
+
 * Tue Jul 17 2012 Jiri Popelka <jpopelka at redhat.com> - 3.4.0.1-2
 - Match actual license