Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d352a82773e8e05d9e3730db63b2580ef7543813

commit d352a82773e8e05d9e3730db63b2580ef7543813
Author: Baste <[email protected]>
Date:   Thu Jun 14 16:49:32 2012 +0200

gnome-common-3.4.0.1-2-x86_64
* add automake 1.12 patch

diff --git a/source/gnome-extra/gnome-common/FrugalBuild 
b/source/gnome-extra/gnome-common/FrugalBuild
index eda90a4..684ecb1 100644
--- a/source/gnome-extra/gnome-common/FrugalBuild
+++ b/source/gnome-extra/gnome-common/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=gnome-common
pkgver=3.4.0.1
-pkgrel=1
+pkgrel=2
pkgdesc="Common macros for GNOME"
url="http://www.gnome.org/";
depends=('glibc')
@@ -12,7 +12,7 @@ groups=('gnome-extra')
archs=('i686' 'x86_64' 'arm')
_F_gnome_ext=".tar.xz"
Finclude gnome
-source=(${source[@]} gnome.sh)
+source=(${source[@]} gnome.sh automake.patch)

build() {
Fbuild
@@ -20,4 +20,5 @@ build() {
}

sha1sums=('86b98f7e6402f1e864619294f4ac228af9fe3d63' \
-          'fb0a0d87d507a20c32ec2af9d0f2bda57f28ffaa')
+          'fb0a0d87d507a20c32ec2af9d0f2bda57f28ffaa' \
+          '4cebace82a6d842c55f7ca8694dd5cce2e3d4402')
diff --git a/source/gnome-extra/gnome-common/automake.patch 
b/source/gnome-extra/gnome-common/automake.patch
new file mode 100644
index 0000000..761e37a
--- /dev/null
+++ b/source/gnome-extra/gnome-common/automake.patch
@@ -0,0 +1,26 @@
+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";
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to