ソースを参照

Merge branch 'release-5.0.2-1'

Edvinas Valatka 10 年 前
コミット
1eb263d63b
2 ファイル変更22 行追加24 行削除
  1. 5 5
      .SRCINFO
  2. 17 19
      PKGBUILD

+ 5 - 5
.SRCINFO

@@ -1,13 +1,13 @@
 pkgbase = ccnet
 	pkgdesc = A framework for writing networked applications in C.
-	pkgver = 4.4.2
-	pkgrel = 2
+	pkgver = 5.0.2
+	pkgrel = 1
 	url = https://github.com/haiwen/ccnet/
 	arch = i686
 	arch = x86_64
 	arch = armv7h
 	arch = armv6h
-	license = custom
+	license = GPL3
 	makedepends = vala
 	makedepends = pacman>=4.1
 	depends = libevent
@@ -17,11 +17,11 @@ pkgbase = ccnet
 	depends = libldap
 	depends = python2
 	options = !makeflags
-	source = ccnet-v4.4.2.tar.gz::https://github.com/haiwen/ccnet/archive/v4.4.2.tar.gz
+	source = ccnet-v5.0.2-server.tar.gz::https://github.com/haiwen/ccnet/archive/v5.0.2-server.tar.gz
 	source = https://raw.githubusercontent.com/haiwen/ccnet/master/COPYRIGHT
 	source = libccnet.pc.patch
 	source = autoconfiguration-for-libjansson.patch
-	sha256sums = b677a7176d2535581e8d25b333ec5b2d83a2270f2a888917b51299a85f8cfb3d
+	sha256sums = e734ac1a243c073456b4ef82fac412a63b5731f4fddb45bf27170ff45d29f11b
 	sha256sums = c07aeccf581c255e60acbddcc6af90290e0d6354e6ec0ee1987b82845d3d57ac
 	sha256sums = 66c3b02c3981db6a80819e0ae103bedadf8dfdf81405a7f75a9cba714acf973f
 	sha256sums = 382b1da33e2b6c0ebab8d3921d92b7417fa11d969ad822cd43aee499fd7b3d94

+ 17 - 19
PKGBUILD

@@ -2,41 +2,39 @@
 # Maintainer: Edvinas Valatka <edacval@gmail.com>
 
 pkgname=ccnet
-pkgver=4.4.2
-pkgrel=2
+pkgver=5.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=('custom')
+license=('GPL3')
 depends=('libevent' 'libzdb' 'libsearpc>=3.0.7' 'jansson' 'libldap' 'python2')
 makedepends=('vala' 'pacman>=4.1')
 options=('!makeflags')
 
-source=("${pkgname}-v${pkgver}.tar.gz::https://github.com/haiwen/${pkgname}/archive/v${pkgver}.tar.gz"
-	"https://raw.githubusercontent.com/haiwen/ccnet/master/COPYRIGHT"
-	"libccnet.pc.patch"
-	"autoconfiguration-for-libjansson.patch")
+source=("${pkgname}-v${pkgver}-server.tar.gz::https://github.com/haiwen/${pkgname}/archive/v${pkgver}-server.tar.gz"
+    "https://raw.githubusercontent.com/haiwen/ccnet/master/COPYRIGHT"
+    "libccnet.pc.patch"
+    "autoconfiguration-for-libjansson.patch")
 
 prepare () {
-	cd "$srcdir/$pkgname-$pkgver"
-	patch -p1 -i $srcdir/libccnet.pc.patch
-	patch -p1 -i $srcdir/autoconfiguration-for-libjansson.patch
+    cd "$srcdir/$pkgname-$pkgver-server"
+    patch -p1 -i $srcdir/libccnet.pc.patch
+    patch -p1 -i $srcdir/autoconfiguration-for-libjansson.patch
 }
 
 build () {
-	cd "$srcdir/$pkgname-$pkgver"
-	./autogen.sh
-	CFLAGS="$CFLAGS -lpthread" ./configure --enable-server --enable-ldap --prefix=/usr PYTHON=/usr/bin/python2
-	make -j1
+    cd "$srcdir/$pkgname-$pkgver-server"
+    ./autogen.sh
+    CFLAGS="$CFLAGS -lpthread" ./configure --enable-server --enable-ldap --prefix=/usr PYTHON=/usr/bin/python2
+    make -j1
 }
 
 package () {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-    mkdir -p $pkgdir/usr/share/licenses/$pkgname
-    cp COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/
+    cd "$srcdir/$pkgname-$pkgver-server"
+    make DESTDIR="$pkgdir" install
 }
-sha256sums=('b677a7176d2535581e8d25b333ec5b2d83a2270f2a888917b51299a85f8cfb3d'
+sha256sums=('e734ac1a243c073456b4ef82fac412a63b5731f4fddb45bf27170ff45d29f11b'
             'c07aeccf581c255e60acbddcc6af90290e0d6354e6ec0ee1987b82845d3d57ac'
             '66c3b02c3981db6a80819e0ae103bedadf8dfdf81405a7f75a9cba714acf973f'
             '382b1da33e2b6c0ebab8d3921d92b7417fa11d969ad822cd43aee499fd7b3d94')