[arch-commits] Commit in mate-common/trunk (PKGBUILD add-automake-115.diff)

[Martin Wimpress]

    Date: Friday, March 13, 2015 @ 11:45:12
  Author: flexiondotorg
Revision: 129169

upgpkg: mate-common 1.8.0-2 - Add automate 1.15 support

Added:
  mate-common/trunk/add-automake-115.diff
Modified:
  mate-common/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   13 ++++++++++---
 add-automake-115.diff |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-13 09:56:41 UTC (rev 129168)
+++ PKGBUILD	2015-03-13 10:45:12 UTC (rev 129169)
@@ -2,15 +2,22 @@
 
 pkgname=mate-common
 pkgver=1.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Common development macros for MATE"
 arch=('any')
 license=('GPL')
 depends=('autoconf' 'automake' 'gettext' 'gtk-doc' 'intltool' 'libtool' 'pkg-config')
 url="http://mate-desktop.org"
-source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('41156798ed4cc55d39bb85eaeffa244b224fa3f6')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz"
+        'add-automake-115.diff')
+sha1sums=('41156798ed4cc55d39bb85eaeffa244b224fa3f6'
+          '851b95dbc5151ac5e6dfcf05eaede2911fa575bc')
 
+prepare() {
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+    patch -Np1 -i "${srcdir}/add-automake-115.diff"
+}
+
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure \

Added: add-automake-115.diff
===================================================================
--- add-automake-115.diff	                        (rev 0)
+++ add-automake-115.diff	2015-03-13 10:45:12 UTC (rev 129169)
@@ -0,0 +1,32 @@
+diff --git a/macros/mate-autogen b/macros/mate-autogen
+index cd51e86..071e42a 100644
+--- a/macros/mate-autogen
++++ b/macros/mate-autogen
+@@ -360,16 +360,17 @@ done
+ 
+ case $REQUIRED_AUTOMAKE_VERSION in
+     1.4*) automake_progs="automake-1.4" ;;
+-    1.5*) automake_progs="automake-1.14 automake-1.13 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.14 automake-1.13 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.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+-    1.8*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+-    1.9*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
+-    1.10*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;;
+-    1.11*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11" ;;
+-    1.12*) automake_progs="automake-1.14 automake-1.13 automake-1.12" ;;
+-    1.13*) automake_progs="automake-1.14 automake-1.13" ;;
+-    1.14*) automake_progs="automake-1.14" ;;
++    1.5*) automake_progs="automake-1.15 automake-1.14 automake-1.13 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.15 automake-1.14 automake-1.13 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.15 automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
++    1.8*) automake_progs="automake-1.15 automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
++    1.9*) automake_progs="automake-1.15 automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
++    1.10*) automake_progs="automake-1.15 automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;;
++    1.11*) automake_progs="automake-1.15 automake-1.14 automake-1.13 automake-1.12 automake-1.11" ;;
++    1.12*) automake_progs="automake-1.15 automake-1.14 automake-1.13 automake-1.12" ;;
++    1.13*) automake_progs="automake-1.15 automake-1.14 automake-1.13" ;;
++    1.14*) automake_progs="automake-1.15 automake-1.14" ;;
++    1.15*) automake_progs="automake-1.15" ;;
+ esac
+ version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
+     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"