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

[Martin Wimpress]

    Date: Thursday, May 7, 2015 @ 12:58:11
  Author: flexiondotorg
Revision: 132864

upgpkg: mate-common 1.10.0-1 - New upstream release.

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

-----------------------+
 PKGBUILD              |   19 +++++++------------
 add-automake-115.diff |   32 --------------------------------
 2 files changed, 7 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-07 10:41:11 UTC (rev 132863)
+++ PKGBUILD	2015-05-07 10:58:11 UTC (rev 132864)
@@ -1,23 +1,18 @@
 # Maintainer : Martin Wimpress <code at flexion.org>
 
+_ver=1.10
 pkgname=mate-common
-pkgver=1.8.0
-pkgrel=2
+pkgver=${_ver}.0
+pkgrel=1
 pkgdesc="Common development macros for MATE"
 arch=('any')
 license=('GPL')
-depends=('autoconf' 'automake' 'gettext' 'gtk-doc' 'intltool' 'libtool' 'pkg-config')
+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"
-        'add-automake-115.diff')
-sha1sums=('41156798ed4cc55d39bb85eaeffa244b224fa3f6'
-          '851b95dbc5151ac5e6dfcf05eaede2911fa575bc')
+source=("http://pub.mate-desktop.org/releases/${_ver}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('8fa8603168e839f645603f52757cab5e3b4d8595')
 
-prepare() {
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-    patch -Np1 -i "${srcdir}/add-automake-115.diff"
-}
-
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure \

Deleted: add-automake-115.diff
===================================================================
--- add-automake-115.diff	2015-05-07 10:41:11 UTC (rev 132863)
+++ add-automake-115.diff	2015-05-07 10:58:11 UTC (rev 132864)
@@ -1,32 +0,0 @@
-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"