Resync against extra/libplist

2 files changed, 15 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fbd7d2920060..c93f7d388bb9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libplist-git
 	pkgdesc = A library to handle Apple Property List format whereas it's binary or XML
-	pkgver = 2.1.0.r34.ge2a030a
+	pkgver = 2.3.0.r5.g954b3e4
 	pkgrel = 1
 	epoch = 1
 	url = http://www.libimobiledevice.org/
@@ -11,13 +11,15 @@ pkgbase = libplist-git
 	makedepends = python
 	makedepends = cython
 	makedepends = autoconf-archive
-	makedepends = git
 	makedepends = python-setuptools
-	depends = glib2
-	provides = libplist=2.1.0.r34.ge2a030a
+	makedepends = git
+	depends = gcc-libs
+	optdepends = python: for the Python bindings
+	provides = libplist-2.0.so
+	provides = libplist++-2.0.so
+	provides = libplist=2.3.0.r5.g954b3e4
 	conflicts = libplist
 	source = git+https://github.com/libimobiledevice/libplist
 	sha256sums = SKIP
 
 pkgname = libplist-git
-
diff --git a/PKGBUILD b/PKGBUILD
index a40155df978b..1f01fe7e2074 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,22 +6,23 @@
 
 pkgname=libplist-git
 epoch=1
-pkgver=2.1.0.r34.ge2a030a
+pkgver=2.3.0.r5.g954b3e4
 pkgrel=1
 pkgdesc="A library to handle Apple Property List format whereas it's binary or XML"
 url="http://www.libimobiledevice.org/"
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
-depends=('glib2')
-makedepends=('python' 'cython' 'autoconf-archive' 'git' 'python-setuptools')
-provides=("libplist=$pkgver")
+depends=('gcc-libs')
+makedepends=('python' 'cython' 'autoconf-archive' 'python-setuptools' 'git')
+optdepends=('python: for the Python bindings')
+provides=(libplist-2.0.so libplist++-2.0.so "libplist=$pkgver")
 conflicts=('libplist')
 source=("git+https://github.com/libimobiledevice/libplist")
 sha256sums=('SKIP')
 
 pkgver() {
 	cd libplist
-	git describe --long --tags | sed 's/-/.r/;s/-/./'
+	git describe --long --tags | sed 's/[^-]*-g/r&/;s/-/./g'
 }
 
 prepare() {
@@ -31,7 +32,7 @@ prepare() {
 
 build() {
 	cd libplist
-	./configure --prefix=/usr
+	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
 	make
 }
 
@@ -43,5 +44,5 @@ check() {
 package() {
 	cd libplist
 	make DESTDIR="$pkgdir" install
-	install -Dm644 cython/plist.pxd -t "${pkgdir}/usr/include/plist/cython"
+	install -D -m644 cython/plist.pxd "${pkgdir}"/usr/include/plist/cython/plist.pxd
 }