[arch-commits] Commit in dbus/trunk (PKGBUILD)

[Jan Steffens]

    Date: Wednesday, January 22, 2020 @ 22:58:41
  Author: heftig
Revision: 373807

1.12.16-4

Modified:
  dbus/trunk/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-22 22:55:45 UTC (rev 373806)
+++ PKGBUILD	2020-01-22 22:58:41 UTC (rev 373807)
@@ -6,13 +6,13 @@
 pkgbase=dbus
 pkgname=(dbus dbus-docs)
 pkgver=1.12.16
-pkgrel=3
+pkgrel=4
 pkgdesc="Freedesktop.org message bus system"
 url="https://wiki.freedesktop.org/www/Software/dbus/"
 arch=(x86_64)
 license=(GPL custom)
-depends=(systemd-libs expat audit)
-makedepends=(systemd xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive graphviz)
+depends=(expat libsystemd.so libaudit.so)
+makedepends=(systemd xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive)
 _commit=23cc709db8fab94f11fa48772bff396b20aea8b0  # tags/dbus-1.12.16^0
 source=("git+https://gitlab.freedesktop.org/dbus/dbus.git#commit=$_commit"
         dbus-reload.hook)
@@ -28,11 +28,6 @@
 
 prepare() {
   cd dbus
-
-  # Reduce docs size
-  printf '%s\n' >>Doxyfile.in \
-    HAVE_DOT=yes DOT_IMAGE_FORMAT=svg INTERACTIVE_SVG=yes
-
   NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -65,22 +60,21 @@
 }
 
 package_dbus() {
-  provides=(libdbus)
+  provides=(libdbus libdbus-1.so)
   conflicts=(libdbus)
   replaces=(libdbus)
 
   DESTDIR="$pkgdir" make -C dbus install
 
-  rm -r "$pkgdir/var/run"
+  rm -r "$pkgdir"/{etc,var}
 
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
-
-  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
-
   # 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/libalpm/hooks" -m644 *.hook
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
+
   # Split docs
   mv "$pkgdir/usr/share/doc" "$srcdir"
 }
@@ -90,7 +84,6 @@
   depends=()
 
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
-
   mv doc "$pkgdir/usr/share"
 }