1 files changed, 9 insertions, 13 deletions
diff --git a/nonsystemd/dbus/PKGBUILD b/nonsystemd/dbus/PKGBUILD
index 51a10e947..5c9778c0d 100644
--- a/nonsystemd/dbus/PKGBUILD
+++ b/nonsystemd/dbus/PKGBUILD
@@ -6,15 +6,17 @@
 
 pkgname=dbus
 pkgver=1.12.16
-pkgrel=3
+pkgrel=5
 pkgrel+=.nonsystemd1
 pkgdesc="Freedesktop.org message bus system"
 url="https://wiki.freedesktop.org/www/Software/dbus/"
 arch=(x86_64 i686 armv7h)
 license=(GPL custom)
 depends=(libx11 libelogind expat audit)
-makedepends=(elogind xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive graphviz)
-provides=(libdbus $pkgname-{elogind,openrc})
+depends+=(libelogind.so libaudit.so)
+makedepends=(elogind xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive)
+provides=(libdbus libdbus-1.so)
+provides+=($pkgname-{elogind,openrc})
 conflicts=(${provides[@]})
 replaces=(${provides[@]})
 _commit=23cc709db8fab94f11fa48772bff396b20aea8b0  # tags/dbus-1.12.16^0
@@ -37,12 +39,7 @@ pkgver() {
 prepare() {
   cd dbus
 
-  # Reduce docs size
-  printf '%s\n' >>Doxyfile.in \
-    HAVE_DOT=yes DOT_IMAGE_FORMAT=svg INTERACTIVE_SVG=yes
-
   patch -Np 1 -i ${srcdir}/dbus-enable-elogind.patch
-
   NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -77,20 +74,19 @@ check() {
 package() {
   DESTDIR="$pkgdir" make -C dbus install
 
-  rm -r "$pkgdir/var/run"
-
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
-
-  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
+  rm -r "$pkgdir"/{etc,var}
 
   # We have a pre-assigned uid (81)
   echo 'u dbus 81 "System Message Bus"' |
     install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/dbus.conf"
 
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
+
   # Split docs
   mv "$pkgdir/usr/share/doc" "$srcdir"
 
   # Init script
+  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
   install -Dm755 "$srcdir/dbus.initd" "$pkgdir/etc/init.d/dbus"
   install -d "${pkgdir}/etc/runlevels/default"
   ln -sf "/etc/init.d/dbus" "${pkgdir}/etc/runlevels/default/dbus"