Version 16.04.0

Updated to upstream version 16.04.0
Added missing licenses
Removed docbook-xsl again because it is already a dependency of gnome-common (gnome-common > gtk-doc > docbook-xsl)
Added valgrind since it is an upstream dependency
Removed '-j' option from make again because it builds correctly in parallel mode

2 files changed, 27 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be46c7dad154..89723961f019 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,27 @@
 # Generated by mksrcinfo v8
-# Wed Feb 10 12:10:55 UTC 2016
+# Wed Mar 16 13:50:30 UTC 2016
 pkgbase = lib32-libdbusmenu
 	pkgdesc = A library for passing menus over DBus (32-bit)
-	pkgver = 12.10.3.15.04.20150410.2
+	pkgver = 16.04.0
 	pkgrel = 1
 	url = https://launchpad.net/libdbusmenu
 	arch = i686
 	arch = x86_64
 	license = GPL3
-	makedepends = docbook-xsl
+	license = LGPL2.1
+	license = LGPL3
 	makedepends = gnome-common
 	makedepends = gnome-doc-utils
 	makedepends = gobject-introspection
 	makedepends = intltool
 	makedepends = vala
+	makedepends = valgrind-multilib
 	makedepends = gcc-multilib
 	makedepends = lib32-gtk2
 	makedepends = lib32-gtk3
 	options = !emptydirs
-	source = https://launchpad.net/ubuntu/+archive/primary/+files/libdbusmenu_12.10.3+15.04.20150410.2.orig.tar.gz
-	sha512sums = c15b79464bc6498cb1e912efbe648606b7bf3b5c521c4d4e5c7decf002b4e8362444177922a5abd8a057a803a8cc00e72de6e36209189eb255efb83e2ded0b06
+	source = https://launchpad.net/libdbusmenu/16.04/16.04.0/+download/libdbusmenu-16.04.0.tar.gz
+	sha512sums = ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
 
 pkgname = lib32-libdbusmenu-glib
 	depends = lib32-glib2
diff --git a/PKGBUILD b/PKGBUILD
index 3d362b420887..8829b120a3e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,24 +6,22 @@
 _pkgbase='libdbusmenu'
 pkgbase="lib32-${_pkgbase}"
 pkgname=("lib32-${_pkgbase}-glib" "lib32-${_pkgbase}-gtk"{2,3})
-_actual_ver=12.10.3
-_extra_ver=+15.04.20150410.2
-pkgver=${_actual_ver}${_extra_ver/+/.}
+pkgver=16.04.0
 pkgrel=1
 pkgdesc="A library for passing menus over DBus (32-bit)"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/${_pkgbase}"
-license=('GPL3')
-makedepends=('docbook-xsl' 'gnome-common' 'gnome-doc-utils' 'gobject-introspection' 'intltool' 'vala' 'gcc-multilib' 'lib32-gtk'{2,3})
+license=('GPL3' 'LGPL2.1' 'LGPL3')
+makedepends=('gnome-common' 'gnome-doc-utils' 'gobject-introspection' 'intltool' 'vala' 'valgrind-multilib' 'gcc-multilib' 'lib32-gtk'{2,3})
 options=('!emptydirs')
-source=("https://launchpad.net/ubuntu/+archive/primary/+files/${_pkgbase}_${_actual_ver}${_extra_ver}.orig.tar.gz")
-sha512sums=('c15b79464bc6498cb1e912efbe648606b7bf3b5c521c4d4e5c7decf002b4e8362444177922a5abd8a057a803a8cc00e72de6e36209189eb255efb83e2ded0b06')
+source=("https://launchpad.net/libdbusmenu/${pkgver%.?}/${pkgver}/+download/${_pkgbase}-${pkgver}.tar.gz")
+sha512sums=('ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241')
 
 prepare() {
 	cd "${srcdir}"
 	rm -rf "${_pkgbase}-gtk"{2,3} &> /dev/null
-	cp -r "${_pkgbase}-${_actual_ver}${_extra_ver}" "${pkgbase}-gtk2"
-	mv    "${_pkgbase}-${_actual_ver}${_extra_ver}" "${pkgbase}-gtk3"
+	cp -rp "${_pkgbase}-${pkgver}" "${pkgbase}-gtk2"
+	mv     "${_pkgbase}-${pkgver}" "${pkgbase}-gtk3"
 }
 
 build() {
@@ -35,21 +33,21 @@ build() {
 	export HAVE_VALGRIND_FALSE=''
 
 	cd "${srcdir}/${pkgbase}-gtk2"
-	./autogen.sh --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --libdir=/usr/lib32 \
-	             --disable-{dumper,static,tests} --with-gtk=2
-	make -j1
+	./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --libdir=/usr/lib32 \
+	            --disable-{dumper,static,tests} --with-gtk=2
+	make
 
 	cd "${srcdir}/${pkgbase}-gtk3"
-	./autogen.sh --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --libdir=/usr/lib32 \
-	             --disable-{dumper,static,tests} --with-gtk=3
-	make -j1
+	./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --libdir=/usr/lib32 \
+	            --disable-{dumper,static,tests} --with-gtk=3
+	make
 }
 
 package_lib32-libdbusmenu-glib() {
 	depends=('lib32-glib2' "${_pkgbase}-glib")
 
 	cd "${srcdir}/${pkgbase}-gtk3"
-	make -j1 -C "${_pkgbase}-glib" DESTDIR="${pkgdir}" install
+	make -C "${_pkgbase}-glib" DESTDIR="${pkgdir}" install
 	rm -rf "${pkgdir}"/usr/{include,share,lib,bin}
 }
 
@@ -58,9 +56,9 @@ package_lib32-libdbusmenu-gtk2() {
 	depends=('lib32-gtk2' "lib32-${_pkgbase}-glib" "${_pkgbase}-gtk2")
 
 	cd "${srcdir}/${pkgname}"
-	make -j1 -C "${_pkgbase}-glib" DESTDIR="${pkgdir}" install
-	make -j1 -C "${_pkgbase}-gtk"  DESTDIR="${pkgdir}" install
-	make -j1 -C "${_pkgbase}-glib" DESTDIR="${pkgdir}" uninstall
+	make -C "${_pkgbase}-glib" DESTDIR="${pkgdir}" install
+	make -C "${_pkgbase}-gtk"  DESTDIR="${pkgdir}" install
+	make -C "${_pkgbase}-glib" DESTDIR="${pkgdir}" uninstall
 	rm -rf "${pkgdir}"/usr/{include,share,lib,bin}
 }
 
@@ -69,8 +67,8 @@ package_lib32-libdbusmenu-gtk3() {
 	depends=('lib32-gtk3' "lib32-${_pkgbase}-glib" "${_pkgbase}-gtk3")
 
 	cd "${srcdir}/${pkgname}"
-	make -j1 -C "${_pkgbase}-glib" DESTDIR="${pkgdir}" install
-	make -j1 -C "${_pkgbase}-gtk"  DESTDIR="${pkgdir}" install
-	make -j1 -C "${_pkgbase}-glib" DESTDIR="${pkgdir}" uninstall
+	make -C "${_pkgbase}-glib" DESTDIR="${pkgdir}" install
+	make -C "${_pkgbase}-gtk"  DESTDIR="${pkgdir}" install
+	make -C "${_pkgbase}-glib" DESTDIR="${pkgdir}" uninstall
 	rm -rf "${pkgdir}"/usr/{include,share,lib,bin}
 }