updpkg: 6.0.2

2 files changed, 21 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 437ee2642720..0d0f03fd789b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,22 @@
 # Generated by mksrcinfo v8
-# Fri Aug 12 13:03:44 UTC 2016
+# Sat Jan  7 15:00:05 UTC 2017
 pkgbase = ccnet
 	pkgdesc = A framework for writing networked applications in C.
-	pkgver = 6.0.0
+	pkgver = 6.0.2
 	pkgrel = 1
 	url = https://github.com/haiwen/ccnet
 	arch = i686
 	arch = x86_64
 	arch = armv7h
 	arch = armv6h
-	license = GPL3
+	license = GPL2
 	makedepends = vala
 	makedepends = libmariadbclient
-	depends = libevent
-	depends = libzdb
-	depends = libsearpc
-	depends = libldap
-	depends = python2
+	depends = ccnet-server
 	options = !makeflags
-	source = ccnet-v6.0.0-server.tar.gz::https://github.com/haiwen/ccnet/archive/v6.0.0-server.tar.gz
+	source = ccnet-v6.0.2-server.tar.gz::https://github.com/haiwen/ccnet/archive/v6.0.2.tar.gz
 	source = libccnet.pc.patch
-	sha256sums = bb7be1c4a6c0a6d4cc9456089c6d16bbeba72541a4a9b59ead8a4075f067fc93
+	sha256sums = c78e4bc7b42fbaa8afae4edc5d474da72ae2d4c06745e3452e4926316d832862
 	sha256sums = 66c3b02c3981db6a80819e0ae103bedadf8dfdf81405a7f75a9cba714acf973f
 
 pkgname = ccnet
diff --git a/PKGBUILD b/PKGBUILD
index 44d0212c147e..06969fc420c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,34 +4,37 @@
 # Contributor: Adrian Hühn <adrian.huehn@web.de>
 
 pkgname=ccnet
-pkgver=6.0.0
+pkgver=6.0.2
 pkgrel=1
 pkgdesc="A framework for writing networked applications in C."
 arch=('i686' 'x86_64' 'armv7h' 'armv6h')
-url="https://github.com/haiwen/ccnet"
-license=('GPL3')
-depends=('libevent' 'libzdb' 'libsearpc' 'libldap' 'python2')
+url="https://github.com/haiwen/${pkgname}"
+license=('GPL2')
+depends=('ccnet-server')
 makedepends=('vala' 'libmariadbclient' )
 options=('!makeflags')
-
-source=("${pkgname}-v${pkgver}-server.tar.gz::${url}/archive/v${pkgver}-server.tar.gz"
-    "libccnet.pc.patch")
-sha256sums=('bb7be1c4a6c0a6d4cc9456089c6d16bbeba72541a4a9b59ead8a4075f067fc93'
+source=("${pkgname}-v${pkgver}-server.tar.gz::${url}/archive/v${pkgver}.tar.gz"
+        "libccnet.pc.patch")
+sha256sums=('c78e4bc7b42fbaa8afae4edc5d474da72ae2d4c06745e3452e4926316d832862'
             '66c3b02c3981db6a80819e0ae103bedadf8dfdf81405a7f75a9cba714acf973f')
 
 prepare () {
-    cd "${srcdir}/${pkgname}-${pkgver}-server"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     patch -p1 -i "${srcdir}"/libccnet.pc.patch
 }
 
 build () {
-    cd "${srcdir}/${pkgname}-${pkgver}-server"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     ./autogen.sh
-    ./configure --enable-server --enable-ldap --prefix=/usr --disable-compile-demo PYTHON=/usr/bin/python2
+    ./configure --prefix=/usr --enable-console PYTHON=/usr/bin/python2
     make
 }
 
 package () {
-    cd "${srcdir}/${pkgname}-${pkgver}-server"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make DESTDIR="$pkgdir" install
+
+    # Already provided by ccnet-server
+    rm -rf "${pkgdir}/usr/include"
+    rm -rf "${pkgdir}/usr/lib"
 }