Added docbook-xsl to makedepends

2 files changed, 17 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8408d9973f2..be46c7dad154 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Feb  3 13:01:45 UTC 2016
+# Wed Feb 10 12:10:55 UTC 2016
 pkgbase = lib32-libdbusmenu
 	pkgdesc = A library for passing menus over DBus (32-bit)
 	pkgver = 12.10.3.15.04.20150410.2
@@ -8,6 +8,7 @@ pkgbase = lib32-libdbusmenu
 	arch = i686
 	arch = x86_64
 	license = GPL3
+	makedepends = docbook-xsl
 	makedepends = gnome-common
 	makedepends = gnome-doc-utils
 	makedepends = gobject-introspection
@@ -20,6 +21,10 @@ pkgbase = lib32-libdbusmenu
 	source = https://launchpad.net/ubuntu/+archive/primary/+files/libdbusmenu_12.10.3+15.04.20150410.2.orig.tar.gz
 	sha512sums = c15b79464bc6498cb1e912efbe648606b7bf3b5c521c4d4e5c7decf002b4e8362444177922a5abd8a057a803a8cc00e72de6e36209189eb255efb83e2ded0b06
 
+pkgname = lib32-libdbusmenu-glib
+	depends = lib32-glib2
+	depends = libdbusmenu-glib
+
 pkgname = lib32-libdbusmenu-gtk2
 	pkgdesc = A library for passing menus over DBus (32-bit) (GTK+ 2 library)
 	depends = lib32-gtk2
@@ -32,7 +37,3 @@ pkgname = lib32-libdbusmenu-gtk3
 	depends = lib32-libdbusmenu-glib
 	depends = libdbusmenu-gtk3
 
-pkgname = lib32-libdbusmenu-glib
-	depends = lib32-glib2
-	depends = libdbusmenu-glib
-
diff --git a/PKGBUILD b/PKGBUILD
index bed453a3dbd6..3d362b420887 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 _pkgbase='libdbusmenu'
 pkgbase="lib32-${_pkgbase}"
-pkgname=("lib32-${_pkgbase}-gtk2" "lib32-${_pkgbase}-gtk3" "lib32-${_pkgbase}-glib")
+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/+/.}
@@ -14,14 +14,14 @@ pkgdesc="A library for passing menus over DBus (32-bit)"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/${_pkgbase}"
 license=('GPL3')
-makedepends=('gnome-common' 'gnome-doc-utils' 'gobject-introspection' 'intltool' 'vala' 'gcc-multilib' lib32-gtk{2,3})
+makedepends=('docbook-xsl' 'gnome-common' 'gnome-doc-utils' 'gobject-introspection' 'intltool' 'vala' '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')
 
 prepare() {
 	cd "${srcdir}"
-	rm -rf ${_pkgbase}-gtk{2,3} &> /dev/null
+	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"
 }
@@ -45,6 +45,14 @@ build() {
 	make -j1
 }
 
+package_lib32-libdbusmenu-glib() {
+	depends=('lib32-glib2' "${_pkgbase}-glib")
+
+	cd "${srcdir}/${pkgbase}-gtk3"
+	make -j1 -C "${_pkgbase}-glib" DESTDIR="${pkgdir}" install
+	rm -rf "${pkgdir}"/usr/{include,share,lib,bin}
+}
+
 package_lib32-libdbusmenu-gtk2() {
 	pkgdesc+=" (GTK+ 2 library)"
 	depends=('lib32-gtk2' "lib32-${_pkgbase}-glib" "${_pkgbase}-gtk2")
@@ -66,11 +74,3 @@ package_lib32-libdbusmenu-gtk3() {
 	make -j1 -C "${_pkgbase}-glib" DESTDIR="${pkgdir}" uninstall
 	rm -rf "${pkgdir}"/usr/{include,share,lib,bin}
 }
-
-package_lib32-libdbusmenu-glib() {
-	depends=('lib32-glib2' "${_pkgbase}-glib")
-
-	cd "${srcdir}/${pkgbase}-gtk3"
-	make -j1 -C "${_pkgbase}-glib" DESTDIR="${pkgdir}" install
-	rm -rf "${pkgdir}"/usr/{include,share,lib,bin}
-}