Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting10.git;a=commitdiff;h=9d9dc61e3fd7763ba8ca141aed47c8f30d366bd6
commit 9d9dc61e3fd7763ba8ca141aed47c8f30d366bd6 Author: James Buren <[email protected]> Date: Mon Feb 18 01:21:34 2013 -0600 dbus-1.6.8-4-x86_64 * strip out systemd schema usage completely * recursive depends on systemd is a bad thing * also drop /var/run/console from the tmpfiles.d file as it's redundant diff --git a/source/base/dbus/FrugalBuild b/source/base/dbus/FrugalBuild index 98076b6..88203f0 100644 --- a/source/base/dbus/FrugalBuild +++ b/source/base/dbus/FrugalBuild @@ -3,11 +3,10 @@ pkgname=dbus pkgver=1.6.8 -pkgrel=3 +pkgrel=4 pkgdesc="A message bus system" url="http://freedesktop.org/wiki/Software/dbus"; -depends=('libxml2>=2.7.8' 'expat' 'shadow') -rodepends=('shadow' 'grep') +depends=('libxml2>=2.7.8' 'expat' 'shadow' 'grep') groups=('base' 'core') archs=('i686' 'x86_64' 'arm') up2date="Flasttar http://dbus.freedesktop.org/releases/dbus/"; @@ -21,10 +20,6 @@ sha1sums=('d9634807d1de9b64727ae2178e3af2227fca0fca' \ '9009283707f5cdf0f883876f80596bc44cc8722c' \ 'ea50f96a7e3048da4d6a0861942ebaba2cf482d7') -_F_systemd_scriptlet="$pkgname.install" -_F_systemd_units=(dbus=e) -Finclude systemd - subpkgs=('dbus-x11') subconflicts=('dbus-gtk+2') subreplaces=('dbus-gtk+2') @@ -80,13 +75,10 @@ build() Frm /var/run Fmkdir /etc/tmpfiles.d cat > $Fdestdir/etc/tmpfiles.d/dbus.conf << EOF -d $Flocalstatedir/run/console 0755 root root - d $Flocalstatedir/run/dbus 0755 root root - EOF Fsplit dbus-x11 usr/bin/dbus-launch /etc/xdg usr/bin/dbus-1-launch - - Fgenscriptlet } # optimization OK diff --git a/source/base/dbus/dbus.install b/source/base/dbus/dbus.install index 5d55c78..710b156 100644 --- a/source/base/dbus/dbus.install +++ b/source/base/dbus/dbus.install @@ -1,6 +1,3 @@ -sysvinit_units=(@_F_sysvinit_units@) -systemd_units=(@_F_systemd_units@) - post_install() { if ! grep -q 'messagebus' /etc/group; then @@ -10,24 +7,6 @@ post_install() chown root:messagebus /usr/lib/dbus-1/dbus-daemon-launch-helper chmod 4750 /usr/lib/dbus-1/dbus-daemon-launch-helper /usr/bin/dbus-uuidgen --ensure - - local unit - local op - - for i in ${sysvinit_units[@]}; do - chkconfig --del rc.$i >/dev/null 2>&1 - done - - for i in ${systemd_units[@]}; do - unit=$(echo $i | cut -f 1 -d '=') - op=$(echo $i | cut -f 2 -d '=') - if echo $op | grep -q 'e'; then - systemctl enable $unit.service >/dev/null 2>&1 - fi - if echo $op | grep -q 's'; then - systemctl start $unit.service >/dev/null 2>&1 - fi - done } post_upgrade() @@ -41,12 +20,6 @@ post_upgrade() chown root:messagebus /usr/lib/dbus-1/dbus-daemon-launch-helper chmod 4750 /usr/lib/dbus-1/dbus-daemon-launch-helper /usr/bin/dbus-uuidgen --ensure - - for i in ${sysvinit_units[@]}; do - chkconfig --del rc.$i >/dev/null 2>&1 - done - - systemctl daemon-reload >/dev/null 2>&1 } pre_remove() @@ -55,23 +28,6 @@ pre_remove() /usr/sbin/userdel messagebus 2>/dev/null /usr/sbin/groupdel messagebus 2>/dev/null fi - - local unit - - for i in ${sysvinit_units[@]}; do - chkconfig --del rc.$i >/dev/null 2>&1 - done - - for i in ${systemd_units[@]}; do - unit=$(echo $i | cut -f 1 -d '=') - systemctl --no-reload disable $unit.service >/dev/null 2>&1 - systemctl stop $unit.service >/dev/null 2>&1 - done -} - -post_remove() -{ - systemctl daemon-reload >/dev/null 2>&1 } op=$1 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
