Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemdbump.git;a=commitdiff;h=46fd487c13dc428db40cdd9436070e511f570a9c
commit 46fd487c13dc428db40cdd9436070e511f570a9c Author: DeX77 <[email protected]> Date: Sun Nov 1 13:51:10 2015 +0100 dbus-1.10.2-2-x86_64 * remove no longer needed dbus-1-launch diff --git a/source/base/dbus/FrugalBuild b/source/base/dbus/FrugalBuild index 02fc2b6..7263f5e 100644 --- a/source/base/dbus/FrugalBuild +++ b/source/base/dbus/FrugalBuild @@ -3,12 +3,12 @@ pkgname=dbus pkgver=1.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="A message bus system" url="http://freedesktop.org/wiki/Software/dbus"; rodepends=('scriptlet-core') depends=('libxml2>=2.9.2-2' 'expat>=2.1.0-2' 'libsystemd') -makedepends=('xmlto' 'docbook-xsl' 'docbook-xml') +makedepends=('xmlto' 'docbook-xsl' 'docbook-xml' 'systemd') options=('scriptlet') groups=('base' 'core') archs=('i686' 'x86_64' 'arm') @@ -16,11 +16,9 @@ up2date="Flasttar http://dbus.freedesktop.org/releases/dbus/"; backup=(etc/dbus-1/session.conf etc/tmpfiles.d/dbus.conf) source=(http://dbus.freedesktop.org/releases/dbus/$pkgname-$pkgver.tar.gz \ - dbus-1-launch \ dbus-1-launch.desktop) sha1sums=('a7bb0e44bb3551b2e607c5a1f927244bec5b8f0a' \ - '740af74eb43cadf1277346029577aadd3d10f2b5' \ - '9009283707f5cdf0f883876f80596bc44cc8722c') + '1c7bd0b397f281ab26a70d48269496cc5a742509') subpkgs=('dbus-x11') subconflicts=('dbus-gtk+2') @@ -65,10 +63,6 @@ build() Fmake Fmakeinstall - ## DO NOT change that without to ask the Maintainer! ## - ## Install wrapper - Fexe /usr/bin/dbus-1-launch - ## and we use /etc/xdg/autostart for GNOME/XFCE Fexe /etc/xdg/autostart/dbus-1-launch.desktop @@ -80,8 +74,7 @@ build() cat > $Fdestdir/etc/tmpfiles.d/dbus.conf << EOF d $Flocalstatedir/run/dbus 0755 root root - EOF - - Fsplit dbus-x11 usr/bin/dbus-launch /etc/xdg usr/bin/dbus-1-launch + Fsplit dbus-x11 usr/bin/dbus-launch /etc/xdg Ffileschown /usr/lib/dbus-1/dbus-daemon-launch-helper 0 38 Ffileschmod /usr/lib/dbus-1/dbus-daemon-launch-helper 4750 diff --git a/source/base/dbus/dbus-1-launch b/source/base/dbus/dbus-1-launch deleted file mode 100644 index 3d24bcf..0000000 --- a/source/base/dbus/dbus-1-launch +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -dbuslaunch="`which dbus-launch 2>/dev/null`" -if [ "`whoami`" != "fst" -a "`whoami`" != "root" ]; then - if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then - eval `$dbuslaunch --auto-syntax --exit-with-session` - fi -fi diff --git a/source/base/dbus/dbus-1-launch.desktop b/source/base/dbus/dbus-1-launch.desktop index 062b529..a2d2b6e 100644 --- a/source/base/dbus/dbus-1-launch.desktop +++ b/source/base/dbus/dbus-1-launch.desktop @@ -2,6 +2,6 @@ Type=Application Name=dbus-1-launch Comment=dbus-launch starter -Exec=/usr/bin/dbus-1-launch +Exec=/etc/X11/xinit/xinitrc.d/50-systemd-user.sh Terminal=false _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
