[arch-commits] Commit in ibus-libpinyin/trunk (PKGBUILD automake-1.13.patch)

[Felix Yan]

    Date: Thursday, April 17, 2014 @ 08:32:31
  Author: fyan
Revision: 109621

upgpkg: ibus-libpinyin 1.6.92-1

Modified:
  ibus-libpinyin/trunk/PKGBUILD
Deleted:
  ibus-libpinyin/trunk/automake-1.13.patch

---------------------+
 PKGBUILD            |   26 +++++++-------------------
 automake-1.13.patch |   10 ----------
 2 files changed, 7 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-17 06:15:04 UTC (rev 109620)
+++ PKGBUILD	2014-04-17 06:32:31 UTC (rev 109621)
@@ -7,8 +7,8 @@
 # Contributor: Lee.MaRS<leemars at gmail.com>
 
 pkgname=ibus-libpinyin
-pkgver=1.6.91
-pkgrel=2
+pkgver=1.6.92
+pkgrel=1
 pkgdesc="Intelligent Pinyin engine based on libpinyin for IBus"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -15,20 +15,11 @@
 url="https://github.com/libpinyin/ibus-libpinyin"
 depends=('ibus' 'libpinyin' 'python2-xdg')
 makedepends=('git' 'intltool' 'gnome-common')
-source=(https://github.com/libpinyin/ibus-libpinyin/archive/$pkgver.tar.gz
-	automake-1.13.patch)
+source=(https://github.com/libpinyin/ibus-libpinyin/archive/$pkgver.tar.gz)
 
 build() {
-  cd "$srcdir"
-  rm -rf "$srcdir/$pkgname-build"
-  cp -r "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-build"
-  cd "$srcdir/$pkgname-build"
+  cd $pkgname-$pkgver
 
-  patch -Np1 -i "$srcdir/automake-1.13.patch"
-
-  msg "Starting make..."
-  cd "$srcdir/$pkgname-build"
-
   # python2 fix
   for file in $(find . -name '*.py' -print); do
     sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
@@ -39,16 +30,13 @@
     sed -i 's_exec python_exec python2_' $file
   done
 
-  export REQUIRED_AUTOMAKE_VERSION=1.13 automake_progs=automake-1.13
-
-  ./autogen.sh --prefix=/usr --libexecdir=/usr/lib/$pkgname
+  PYTHON=python2 ./autogen.sh --prefix=/usr --libexecdir=/usr/lib/$pkgname
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-build"
+  cd $pkgname-$pkgver
   make NO_INDEX=true DESTDIR="$pkgdir" install
 }
 
-sha512sums=('6e1fb4f1fe3c5c6c37e60c8228b79728c388ffd171b68cea87bc2131e27430cdad6eff174a41111cb0694559f6307be3578ea1c960629bbfc99c41f4dbfc344e'
-            'fbb30cddd1ec140860ce0d5a5a42ad644ae6a1794fb2e805f782fdb43436ad13d2f6f8149b5b68540bbb9beba16dbbdb1d14153cef7fb805de342a8d1bb77965')
+sha512sums=('b4af0083c9c1dd4273c75372acf5d74ce317effdf56d8a0de8a3e3cd24f40b1b2dba91786d0a1cd72c9d7867b9ae630c4f69b04b378529dca8be0869e91d322d')

Deleted: automake-1.13.patch
===================================================================
--- automake-1.13.patch	2014-04-17 06:15:04 UTC (rev 109620)
+++ automake-1.13.patch	2014-04-17 06:32:31 UTC (rev 109621)
@@ -1,10 +0,0 @@
---- a/autogen.sh	2013-03-18 22:55:12.210703327 +0800
-+++ b/autogen.sh	2013-03-18 23:01:11.842675010 +0800
-@@ -19,6 +19,6 @@
- }
- 
- ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
--REQUIRED_AUTOMAKE_VERSION=1.8
-+REQUIRED_AUTOMAKE_VERSION=1.13
- 
- . gnome-autogen.sh "$@"