Sfoglia il codice sorgente

Merge branch 'release-3.0.7-2'

Edvinas Valatka 10 anni fa
parent
commit
de2360c1e6
2 ha cambiato i file con 14 aggiunte e 23 eliminazioni
  1. 3 2
      .SRCINFO
  2. 11 21
      PKGBUILD

+ 3 - 2
.SRCINFO

@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Sat Dec 19 16:03:42 UTC 2015
 pkgbase = libsearpc
 	pkgdesc = A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System.
 	pkgver = 3.0.7
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/haiwen/libsearpc/
 	arch = i686
 	arch = x86_64
@@ -11,7 +13,6 @@ pkgbase = libsearpc
 	depends = glib2
 	depends = pacman>=4.1
 	depends = jansson
-	depends = libtool
 	depends = python2
 	optdepends = python2-simplejson
 	options = !makeflags

+ 11 - 21
PKGBUILD

@@ -3,43 +3,33 @@
 
 pkgname=libsearpc
 pkgver=3.0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="https://github.com/haiwen/libsearpc/"
 license=('GPLv3')
-depends=('glib2' 'pacman>=4.1' 'jansson' 'libtool' 'python2')
+depends=('glib2' 'pacman>=4.1' 'jansson' 'python2')
 optdepends=('python2-simplejson')
 options=('!makeflags')
 source=("libsearpc-v${pkgver}.tar.gz::https://github.com/haiwen/libsearpc/archive/v${pkgver}.tar.gz"
-	"libsearpc.pc.patch")
+        "libsearpc.pc.patch")
 
-configure_libsearpc() {
-	./autogen.sh
-	./configure --prefix=/usr PYTHON=/usr/bin/python2
-}
-
-pkgver() {
-	cd "$srcdir/$pkgname-$pkgver"
-	configure_libsearpc &> /dev/null
-	grep "PACKAGE_VERSION" Makefile | sed 's/PACKAGE_VERSION.*=[ \t]\+\([0-9\.]\+\)[ \t]*/\1/g'
-}
 
 prepare () {
-    pkgver
-	cd "$srcdir/$pkgname-$pkgver"
-	patch -p1 -i $srcdir/libsearpc.pc.patch 
+    cd "$srcdir/$pkgname-$pkgver"
+    patch -p1 -i $srcdir/libsearpc.pc.patch 
 }
 
 build () {
-	cd "$srcdir/$pkgname-$pkgver"
-	configure_libsearpc
-	make -j1
+    cd "$srcdir/$pkgname-$pkgver"
+    ./autogen.sh
+    ./configure --prefix=/usr PYTHON=/usr/bin/python2
+    make -j1
 }
 
 package () {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
+    cd "$srcdir/$pkgname-$pkgver"
+    make DESTDIR="$pkgdir" install
 }
 sha256sums=('efee6b495f93e70101c87849c78b135014dfd2f0e5c08dcfed9834def47cb939'
             'aec39a303aaebc0777a22d8c53367f52f619654d63f62b362d75c1c599e632f4')