Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=4379105a1ac8ca79c79cfa271106d793be08f099
commit 4379105a1ac8ca79c79cfa271106d793be08f099 Author: crazy <[EMAIL PROTECTED]> Date: Wed Jan 23 22:43:38 2008 +0100 dbus-1.0.2-3sayshell1-i686 * release bump * backport from 9e6ba144a150c57573a2b66c25658d09ed3b5061 * that fixed the keyboard hangs diff --git a/source/apps/dbus/FrugalBuild b/source/apps/dbus/FrugalBuild index 91bc946..a37cc4c 100644 --- a/source/apps/dbus/FrugalBuild +++ b/source/apps/dbus/FrugalBuild @@ -3,21 +3,23 @@ pkgname=dbus pkgver=1.0.2 -pkgrel=2 +pkgrel=3sayshell1 pkgdesc="A message bus system" url="http://freedesktop.org/wiki/Software_2fdbus"; -depends=('libxml2') +depends=('libxml2' 'expat') makedepends=('libx11' 'libsm' 'doxygen') rodepends=('shadow') groups=('apps') archs=('i686' 'x86_64') up2date="lynx -dump http://dbus.freedesktop.org/releases/dbus/|Flasttar" source=(http://dbus.freedesktop.org/releases/dbus/$pkgname-$pkgver.tar.gz \ - rc.$pkgname dbus.sh dbus-0.95-dont-crash.patch) + rc.$pkgname dbus-0.95-dont-crash.patch \ + dbus-1-launch dbus-1-launch.desktop) sha1sums=('2870efd6ea0b5b0d14e52195f560238a74bb1e0e' \ 'b5b036bbdd1a3fbe97218ae57bdd565f85160cd9' \ + '7c35583080fdf47bab1888cbcad75870bace315c' \ '740af74eb43cadf1277346029577aadd3d10f2b5' \ - '7c35583080fdf47bab1888cbcad75870bace315c') + 'da9efab479aa3a2a8fb365a89ed658646486c39f') subpkgs=('dbus-x11') subconflicts=('dbus-gtk+2') @@ -31,34 +33,47 @@ subarchs=('i686 x86_64') build() { Fbuild \ + --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --exec-prefix=/ \ --libdir=/usr/lib \ --bindir=/usr/bin \ + --libexecdir=/usr/lib/$pkgname-1 \ --with-x \ --with-system-pid-file=/var/run/dbus/dbus.pid \ --with-system-socket=/var/run/dbus/system_bus_socket \ --with-session-socket-dir=/tmp \ --with-dbus-user=messagebus \ --enable-doxygen-docs \ - --with-xml=libxml \ --enable-dnotify \ --with-gnu-ld \ --disable-xml-docs \ - --enable-asserts=no \ - --enable-checks=no \ - --enable-tests=no \ + --disable-asserts \ + --disable-checks \ + --disable-tests \ --disable-selinux Frcd + ## not sure about that Fmkdir /var/run/console - Fexe /etc/profile.d/dbus.sh + + ## DO NOT change that without to ask the Maintainer! ## + ## Install wrapper + Fexe /usr/bin/dbus-1-launch + + ## we use /usr/env for KDE3 so let us symlink to there + Fln /usr/bin/dbus-1-launch /usr/env/dbus-1-launch.sh + + ## and we use /etc/xdg/autostart for GNOME/XFCE + Fexe /etc/xdg/autostart/dbus-1-launch.desktop + ## just to keep this dirs Fmkdir /etc/dbus-1/system.d/.holdme Fmkdir /usr/share/dbus-1/services/.holdme Fmkdir /var/run/dbus/.holdme - Fsplit dbus-x11 usr/bin/dbus-launch etc/profile.d/dbus.sh + + Fsplit dbus-x11 usr/bin/dbus-launch usr/env /etc/xdg usr/bin/dbus-1-launch } diff --git a/source/apps/dbus/dbus-1-launch b/source/apps/dbus/dbus-1-launch new file mode 100644 index 0000000..3d24bcf --- /dev/null +++ b/source/apps/dbus/dbus-1-launch @@ -0,0 +1,8 @@ +#!/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/apps/dbus/dbus-1-launch.desktop b/source/apps/dbus/dbus-1-launch.desktop new file mode 100644 index 0000000..09b80ee --- /dev/null +++ b/source/apps/dbus/dbus-1-launch.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=dbus-1-launch +Comment=dbus-launch starter +Exec=/usr/bin/dbus-1-launch +Terminal=false + diff --git a/source/apps/dbus/dbus.install b/source/apps/dbus/dbus.install index 6ea3587..cef782d 100644 --- a/source/apps/dbus/dbus.install +++ b/source/apps/dbus/dbus.install @@ -5,6 +5,7 @@ post_install() /usr/sbin/groupadd -g 38 messagebus 2>/dev/null /usr/sbin/useradd -s /bin/false -c "D-BUS system user" -d '/' -u 38 -g messagebus messagebus 2>/dev/null fi + if [ -e /usr/sbin/chkconfig ] && [ -x /usr/sbin/chkconfig ]; then /usr/sbin/chkconfig --add rc.dbus fi @@ -20,6 +21,7 @@ post_upgrade() /usr/sbin/groupadd -g 38 messagebus 2>/dev/null /usr/sbin/useradd -s /bin/false -c "D-BUS system user" -d '/' -u 38 -g messagebus messagebus 2>/dev/null fi + } pre_remove() { diff --git a/source/apps/dbus/dbus.sh b/source/apps/dbus/dbus.sh deleted file mode 100644 index 3d24bcf..0000000 --- a/source/apps/dbus/dbus.sh +++ /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 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
