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

[Jan Steffens]

    Date: Tuesday, September 8, 2015 @ 16:04:23
  Author: heftig
Revision: 245528

with systemd 226: use dbus user bus

Modified:
  dbus/trunk/PKGBUILD
Deleted:
  dbus/trunk/30-dbus

----------+
 30-dbus  |    6 ------
 PKGBUILD |   10 +++-------
 2 files changed, 3 insertions(+), 13 deletions(-)

Deleted: 30-dbus
===================================================================
--- 30-dbus	2015-09-08 11:42:02 UTC (rev 245527)
+++ 30-dbus	2015-09-08 14:04:23 UTC (rev 245528)
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# launches a session dbus instance
-if [ -z "${DBUS_SESSION_BUS_ADDRESS-}" ] && type dbus-launch >/dev/null; then
-  eval $(dbus-launch --sh-syntax --exit-with-session)
-fi

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-08 11:42:02 UTC (rev 245527)
+++ PKGBUILD	2015-09-08 14:04:23 UTC (rev 245528)
@@ -6,17 +6,15 @@
 pkgbase=dbus
 pkgname=('dbus' 'libdbus')
 pkgver=1.10.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/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}
-        30-dbus)
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc})
 md5sums=('5af6297348107a906c8449817a728b3b'
-         'SKIP'
-         '6683a05bd749929ef9442816c22c3268')
+         'SKIP')
 validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie at collabora.co.uk>
 
 build() {
@@ -50,9 +48,7 @@
 
   rm -r "${pkgdir}/var/run"
   rm -r "${pkgdir}/usr/lib/pkgconfig"
-  rm -r "${pkgdir}/usr/lib/systemd/user/sockets.target.wants"
 
-  install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus.sh"
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
 }