crazy
Fri, 21 Apr 2006 10:48:39 -0700
[dbus-0.61-3-i686
crazy <[EMAIL PROTECTED]>**20060421165005
* release bump
* changed m8r to myself
* fixed depends()
* moved from gnome to apps
* merged the patch with all the other small fixes
-- the fixes are from CVS and the missing qt*.pc file patch from gentoo
* switched to xml=libxml , works much better
* KILLED off the whole mono ( will be a extra dbus-mono packge after I fix
mono )
* switched to messagebus user and group
* corrected some paths and also fixed up how we build()
* fixed *install and rc.dbus file ( next one will have the new init scripts
style )
] {
move ./source/gnome/dbus ./source/apps/dbus
hunk ./source/apps/dbus/FrugalBuild 1
-# Last modified: Sun, 16 Apr 2006 13:11:15 +0200
+# Last modified: Fri, 21 Apr 2006 18:47:51 +0200
hunk ./source/apps/dbus/FrugalBuild 3
-# Maintainer: Christian Hamar alias krix <[EMAIL PROTECTED]>
-# Old Maintainer: Laszlo Dvornik <[EMAIL PROTECTED]>
+# Maintainer: crazy <[EMAIL PROTECTED]>
+# Contributor: Laszlo Dvornik <[EMAIL PROTECTED]>
hunk ./source/apps/dbus/FrugalBuild 8
-pkgrel=2
+pkgrel=3
hunk ./source/apps/dbus/FrugalBuild 11
-depends=('expat')
-makedepends=('pyrex' 'mono' 'qt' 'gtk+2' 'doxygen')
-groups=('gnome' 'gnome-core')
+depends=('libxml2' 'expat' 'glib2' 'libstdc++')
+makedepends=('pyrex' 'qt' 'gtk+2' 'doxygen')
+groups=('apps')
hunk ./source/apps/dbus/FrugalBuild 15
+options=('nofakeroot' 'scriptlet')
hunk ./source/apps/dbus/FrugalBuild 18
- rc.$pkgname gvalue-utils-fix.patch0 dbus.sh)
+ rc.$pkgname $pkgname-$pkgver-fixes dbus.sh)
hunk ./source/apps/dbus/FrugalBuild 20
- '2c5230c5c0a367c3b1e90ae4c624d71447d2e523' \
- 'fea4296efa1d28654cbe352e2c6d1ce8f32b5fc2' \
- 'ddfca8d2811a6d9f890553b4e6b5516526cb6c29')
-options=('nofakeroot')
+ '27a266e09eb75f08a7ce9f67aefb9210f7622ac2' \
+ '828c8e329ce1c5a1e2663b44677417c9dd8b816d' \
+ '69b8c2e41ea73cba39d9e1d48db3645a01d3e242')
hunk ./source/apps/dbus/FrugalBuild 26
-subdepends=('dbus expat gtk+2')
-subgroups=('gnome-extra')
+subdepends=('dbus gtk+2')
+subgroups=('apps')
hunk ./source/apps/dbus/FrugalBuild 32
- export MONO_SHARED_DIR=$Fsrcdir/.wabi
- mkdir $MONO_SHARED_DIR
- Fpatchall
- Fconf --sysconfdir=/etc --localstatedir=/var \
- --enable-x --enable-gtk --enable-glib --enable-python \
- --enable-mono --enable-qt3 --enable-checks --enable-asserts \
- --with-system-pid-file=/var/run/dbus.pid \
- --with-system-socket=/var/lib/dbus/system_bus_socket \
- --with-dbus-user=nobody --enable-doxygen-docs
- touch mono/example/{bus-listener,echo-{server,client}}.exe
-
- make || Fdie
-
- Fmakeinstall
- Fmkdir /var/lib/dbus
- rm -rf $MONO_SHARED_DIR
+ Fpatch $pkgname-$pkgver-fixes
+ autoreconf -fvi || return 1
+ Fbuild --sysconfdir=/etc --localstatedir=/var \
+ --with-x --enable-gtk --enable-glib --enable-python \
+ --disable-mono --enable-qt3 --enable-checks \
+ --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 --disable-qt \
+ --with-xml=libxml --enable-dnotify --with-gnu-ld \
+ --disable-xml-docs --disable-asserts --disable-selinux
--disable-mono-docs
hunk ./source/apps/dbus/FrugalBuild 45
+ ## not sure about that
+ Fmkdir /var/run/console
hunk ./source/apps/dbus/FrugalBuild 48
-
hunk ./source/apps/dbus/dbus.install 3
- /usr/sbin/chkconfig --add rc.dbus
+ ## add the group and user if not there
+ if ! grep -q 'messagebus' /etc/group; then
+ /usr/sbin/groupadd -g 35 messagebus 2>/dev/null
+ /usr/sbin/useradd -s /bin/false -c "D-BUS system user" -d
/var/run/dbus -u 35 -g messagebus messagebus 2>/dev/null
+ fi
+ if [ -e /usr/sbin/chkconfig ] && [ -x /usr/sbin/chkconfig ]; then
+ /usr/sbin/chkconfig --add rc.dbus
+ fi
hunk ./source/apps/dbus/dbus.install 13
+post_upgrade()
+{
+
+ ## add the group and user if not there
+ if ! grep -q 'messagebus' /etc/group; then
+ /usr/sbin/groupadd -g 35 messagebus 2>/dev/null
+ /usr/sbin/useradd -s /bin/false -c "D-BUS system user" -d
/var/run/dbus -u 35 -g messagebus messagebus 2>/dev/null
+ fi
+}
hunk ./source/apps/dbus/dbus.install 24
- /usr/sbin/chkconfig --del rc.dbus
+ if [ -e /usr/sbin/chkconfig ] && [ -x /usr/sbin/chkconfig ]; then
+ /usr/sbin/chkconfig --del rc.dbus
+ fi
+ ## mabye already removed ?
+ if grep -q 'messagebus' /etc/group; then
+ /usr/sbin/userdel messagebus 2>/dev/null
+ /usr/sbin/groupdel messagebus 2>/dev/null
+ fi
+
hunk ./source/apps/dbus/dbus.sh 2
-
+## TODO: kill root
hunk ./source/apps/dbus/dbus.sh 5
- eval `$dbuslaunch --sh-syntax --exit-with-session`
+ eval `$dbuslaunch --auto-syntax --exit-with-session`
hunk ./source/apps/dbus/gvalue-utils-fix.patch0 1
---- glib/dbus-gvalue-utils.c 2005-07-18 11:19:13.000000000 +0200
-+++ glib/dbus-gvalue-utils_mod.c 2005-07-18 11:19:09.000000000 +0200
-@@ -254,6 +254,7 @@
- break;
- default:
- g_assert_not_reached ();
-+ return FALSE;
- }
- }
-
rmfile ./source/apps/dbus/gvalue-utils-fix.patch0
hunk ./source/apps/dbus/rc.dbus 12
+DPID="/var/run/dbus/dbus.pid"
hunk ./source/apps/dbus/rc.dbus 16
- killall dbus-daemon
- rm /var/run/dbus.pid
+ if [ -e $DPID ]; then
+ killall dbus-daemon
+ rm -f $DPID
+ fi
hunk ./source/apps/dbus/rc.dbus 27
- /usr/bin/dbus-daemon --system
+ ## we need that
+ if [ ! -d /var/run/dbus ]; then
+ mkdir /var/run/dbus
+ fi
+ ## that too
+ chown messagebus:messagebus /var/run/dbus
+ ## lets kill this weird error if you try to start twice
+ if [ ! -e $DPID ]; then
+ /usr/bin/dbus-daemon --system
+ fi
+
}
_______________________________________________
Frugalware-darcs mailing list
Frugalware-darcs@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-darcs
- [Frugalware-darcs] frugalware-current: dbus-0.61-3-i686 crazy