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

[Jan Steffens]

    Date: Tuesday, August 16, 2016 @ 00:31:47
  Author: heftig
Revision: 273831

1.10.10-1

- Build and run tests
- Build and install docs; split due to volume
- Enable user units on install instead of statically enabling;
  this allows disabling via global disable instead of mask
- Remove x11 support; autolaunching is a lot of magic we don't
  need if we have predictable user buses; unsplit libdbus

Added:
  dbus/trunk/dbus.install
Modified:
  dbus/trunk/PKGBUILD

--------------+
 PKGBUILD     |   74 +++++++++++++++++++++++++++++++--------------------------
 dbus.install |   14 ++++++++++
 2 files changed, 55 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-15 23:15:53 UTC (rev 273830)
+++ PKGBUILD	2016-08-16 00:31:47 UTC (rev 273831)
@@ -1,68 +1,76 @@
 # $Id$
-# Maintainer: Tom Gundersen <teg at jklm.no>
 # Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Tom Gundersen <teg at jklm.no>
 # Contributor: Link Dupont <link at subpop.net>
 
 pkgbase=dbus
-pkgname=('dbus' 'libdbus')
-pkgver=1.10.8
+pkgname=(dbus dbus-docs)
+pkgver=1.10.10
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
-url="http://www.freedesktop.org/Software/dbus"
+url="https://wiki.freedesktop.org/www/Software/dbus/"
 arch=(i686 x86_64)
-license=('GPL' 'custom')
-makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl')
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc})
-md5sums=('e912e930f249454752512aa7ac864d43'
-         'SKIP')
+license=(GPL custom)
+depends=(libsystemd expat)
+makedepends=(systemd xmlto docbook-xsl python yelp-tools doxygen)
+source=(https://dbus.freedesktop.org/releases/$pkgbase/$pkgbase-$pkgver.tar.gz{,.asc})
+sha256sums=('9d8f1d069ab4d1a0255d7b400ea3bcef4430c42e729b1012abb2890e3f739a43'
+            'SKIP')
 validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90'  # Simon McVittie <simon.mcvittie at collabora.co.uk>
               '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie at collabora.co.uk>
 
 prepare() {
-  cd dbus-$pkgver
+  cd $pkgbase-$pkgver
 }
 
 build() {
-  cd dbus-$pkgver
+  cd $pkgbase-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=dbus \
       --with-system-pid-file=/run/dbus/pid \
       --with-system-socket=/run/dbus/system_bus_socket \
       --with-console-auth-dir=/run/console/ \
-      --enable-inotify \
-      --disable-verbose-mode --disable-static \
-      --disable-tests --disable-asserts \
+      --enable-inotify --disable-static \
+      --disable-verbose-mode --disable-asserts \
       --with-systemdsystemunitdir=/usr/lib/systemd/system \
       --enable-systemd --enable-user-session
   make
 }
 
-package_dbus(){
-  depends=('libdbus' 'expat')
-  optdepends=('libx11: dbus-launch support')
-  provides=('dbus-core')
-  conflicts=('dbus-core')
-  replaces=('dbus-core')
+check() {
+  cd $pkgbase-$pkgver
+  make check
+}
 
-  cd dbus-$pkgver
+package_dbus() {
+  provides=(libdbus)
+  conflicts=(libdbus)
+  replaces=(libdbus)
+  install=dbus.install
 
-  # Disable installation of libdbus
-  sed -i -e 's/^SUBDIRS = dbus/SUBDIRS =/' Makefile
+  cd $pkgbase-$pkgver
 
   make DESTDIR="$pkgdir" install
 
-  rm -r "${pkgdir}/var/run"
-  rm -r "${pkgdir}/usr/lib/pkgconfig"
+  rm -r "$pkgdir/var/run"
 
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
+  # Done post-install
+  rm "$pkgdir/usr/lib/systemd/user/sockets.target.wants/dbus.socket"
+  rmdir "$pkgdir/usr/lib/systemd/user/sockets.target.wants"
+
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgbase/COPYING"
+
+  # Split docs
+  mv "$pkgdir/usr/share/doc" "$srcdir"
 }
 
-package_libdbus(){
-  pkgdesc="DBus library"
-  depends=('libsystemd')
+package_dbus-docs() {
+  pkgdesc+=" (documentation)"
+  depends=(dbus)
 
-  cd dbus-$pkgver
-  make DESTDIR="$pkgdir" -C dbus install
-  make DESTDIR="$pkgdir" install-data-am
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/libdbus/COPYING"
+  install -d "$pkgdir/usr/share/licenses"
+  ln -s dbus "$pkgdir/usr/share/licenses/dbus-docs"
+
+  mv doc "$pkgdir/usr/share"
 }

Added: dbus.install
===================================================================
--- dbus.install	                        (rev 0)
+++ dbus.install	2016-08-16 00:31:47 UTC (rev 273831)
@@ -0,0 +1,14 @@
+post_install() {
+  # Enable socket by default
+  systemctl --global enable dbus.socket
+}
+
+post_upgrade() {
+  if (( $(vercmp $2 1.10.10-1) < 0)); then
+    systemctl --global enable dbus.socket
+  fi
+}
+
+pre_remove() {
+  systemctl --global disable dbus.socket
+}