use git repo

fix compilation issues

4 files changed, 12 insertions, 117 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3460a18f1f59..256e4d9729d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libsearpc
 	pkgdesc = A simple C language RPC framework (including both server side & client side)
 	pkgver = 3.3.0
-	pkgrel = 3
+	pkgrel = 4
 	epoch = 2
 	url = https://github.com/haiwen/libsearpc
 	arch = i686
@@ -10,11 +10,12 @@ pkgbase = libsearpc
 	arch = armv6h
 	arch = aarch64
 	license = Apache
+	makedepends = git
 	depends = glib2
 	depends = jansson
 	depends = python-gobject
 	depends = python-simplejson
-	source = libsearpc-3.3-latest.tar.gz::https://github.com/haiwen/libsearpc/archive/v3.3-latest.tar.gz
-	sha256sums = 143ada255ea852a58577a833df0462af98376a3fd2886dc43ead621d656c317d
+	source = libsearpc::git+https://github.com/haiwen/libsearpc#commit=4ccd1988d8abbacc4bda7a14b5a244010b565d9e
+	sha256sums = SKIP
 
 pkgname = libsearpc
diff --git a/PKGBUILD b/PKGBUILD
index 6e77184f9475..d08ee87f1e5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname='libsearpc'
 epoch=2
 pkgver=3.3.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A simple C language RPC framework (including both server side & client side)"
 arch=('i686' 'x86_64' 'armv7h' 'armv6h' 'aarch64')
 url="https://github.com/haiwen/libsearpc"
@@ -17,28 +17,24 @@ depends=(
     'python-gobject'
     'python-simplejson'
 )
-_pkgver="${pkgver%.*}-latest"
-source=("libsearpc-$_pkgver.tar.gz::$url/archive/v$_pkgver.tar.gz")
-sha256sums=('143ada255ea852a58577a833df0462af98376a3fd2886dc43ead621d656c317d')
-
-prepare () {
-    cd "$srcdir/$pkgname-$_pkgver"
-    sed -i 's|(DESTDIR)@prefix@|@prefix@|' './libsearpc.pc.in'
-}
+makedepends=('git')
+_commit='4ccd1988d8abbacc4bda7a14b5a244010b565d9e'
+source=("$pkgname::git+$url#commit=$_commit")
+sha256sums=('SKIP')
 
 build () {
-    cd "$srcdir/$pkgname-$_pkgver"
+    cd "$srcdir/$pkgname"
     ./autogen.sh
     ./configure --prefix=/usr PYTHON='/usr/bin/python'
     make
 }
 
 check () {
-    cd "$srcdir/$pkgname-$_pkgver"
+    cd "$srcdir/$pkgname"
     make check
 }
 
 package () {
-    cd "$srcdir/$pkgname-$_pkgver"
+    cd "$srcdir/$pkgname"
     make DESTDIR="$pkgdir" install
 }
diff --git a/fix_python_future_builtins_object.patch b/fix_python_future_builtins_object.patch
deleted file mode 100644
index 8013e1f5df8e..000000000000
--- a/fix_python_future_builtins_object.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/pysearpc/client.py b/pysearpc/client.py
-index 20e5535..0dc8b5a 100644
---- a/pysearpc/client.py
-+++ b/pysearpc/client.py
-@@ -1,4 +1,4 @@
--from builtins import object
-+from .utils import object
- import json
- from .common import SearpcError
- 
-diff --git a/pysearpc/named_pipe.py b/pysearpc/named_pipe.py
-index a0ca619..113097c 100644
---- a/pysearpc/named_pipe.py
-+++ b/pysearpc/named_pipe.py
-@@ -4,7 +4,7 @@ RPC client/server implementation based on named pipe transport.
- 
- from future import standard_library
- standard_library.install_aliases()
--from builtins import object
-+from .utils import object
- import json
- import logging
- import os
-diff --git a/pysearpc/server.py b/pysearpc/server.py
-index a7ec7be..9bf7a3a 100644
---- a/pysearpc/server.py
-+++ b/pysearpc/server.py
-@@ -1,5 +1,5 @@
- from builtins import str
--from builtins import object
-+from .utils import object
- import json
- 
- from .common import SearpcError
-diff --git a/pysearpc/test_pysearpc.py b/pysearpc/test_pysearpc.py
-index a9c6f8b..41cfb3b 100755
---- a/pysearpc/test_pysearpc.py
-+++ b/pysearpc/test_pysearpc.py
-@@ -1,7 +1,7 @@
- #!/usr/bin/env python
- #coding: UTF-8
- 
--from builtins import object
-+from .utils import object
- import json
- import logging
- import os
-diff --git a/pysearpc/transport.py b/pysearpc/transport.py
-index 3c6e821..8fc630a 100644
---- a/pysearpc/transport.py
-+++ b/pysearpc/transport.py
-@@ -1,5 +1,5 @@
- 
--from builtins import object
-+from .utils import object
- class SearpcTransport(object):
-     """
-     A transport is repsonsible to send the serialized request to the
-diff --git a/pysearpc/utils.py b/pysearpc/utils.py
-index 2aeda93..8c3ddad 100644
---- a/pysearpc/utils.py
-+++ b/pysearpc/utils.py
-@@ -1,9 +1,30 @@
--from builtins import bytes
-+from builtins import bytes, object
- import os
- import socket
- 
- from pysearpc.errors import NetworkError
- 
-+class object(object):
-+
-+    def __nonzero__(self):
-+        """
-+        Fix issue:
-+        https://github.com/PythonCharmers/python-future/issues/282
-+        """
-+        try:
-+            return type(self).__bool__(self)
-+        except AttributeError:
-+            pass
-+
-+        try:
-+            return type(self).__len__(self)
-+        except AttributeError:
-+            pass
-+
-+        # object has no __nonzero__ method
-+        return True
-+
-+
- def recvall(fd, total):
-     remain = total
-     data = bytearray()
diff --git a/libsearpc.pc.patch b/libsearpc.pc.patch
deleted file mode 100644
index aaff6b250e79..000000000000
--- a/libsearpc.pc.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/libsearpc.pc.in	2013-01-10 01:35:24.000000000 -0500
-+++ b/libsearpc.pc.in	2013-01-19 11:31:50.479301798 -0500
-@@ -1,4 +1,4 @@
--prefix=(DESTDIR)@prefix@
-+prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@