wok-4.x rev 11088

Up: dbus to 1.4.16.
author Christopher Rogers <slaxemulator@gmail.com>
date Mon Oct 17 02:38:10 2011 +0000 (2011-10-17)
parents 53665c5f3df6
children 56801b1a7022
files dbus-dev/receipt dbus/receipt
line diff
     1.1 --- a/dbus-dev/receipt	Mon Oct 17 02:35:46 2011 +0000
     1.2 +++ b/dbus-dev/receipt	Mon Oct 17 02:38:10 2011 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="dbus-dev"
     1.7 -VERSION="1.4.8"
     1.8 +VERSION="1.4.16"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="D-Bus is a message bus system devel files."
    1.11  DEPENDS="dbus"
    1.12 @@ -13,8 +13,8 @@
    1.13  genpkg_rules()
    1.14  {
    1.15  	mkdir -p $fs/usr/lib
    1.16 -	cp -a $_pkg/usr/include $fs/usr
    1.17 -	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
    1.18 -	cp -a $_pkg/usr/lib/dbus-1.0 $fs/usr/lib
    1.19 -	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
    1.20 +	cp -a $install/usr/include $fs/usr
    1.21 +	cp -a $install/usr/lib/*.*a $fs/usr/lib
    1.22 +	cp -a $install/usr/lib/dbus-1.0 $fs/usr/lib
    1.23 +	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    1.24  }
     2.1 --- a/dbus/receipt	Mon Oct 17 02:35:46 2011 +0000
     2.2 +++ b/dbus/receipt	Mon Oct 17 02:38:10 2011 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="dbus"
     2.7 -VERSION="1.4.8"
     2.8 +VERSION="1.4.16"
     2.9  CATEGORY="x-window"
    2.10  SHORT_DESC="D-Bus is a message bus system."
    2.11  DEPENDS="expat xorg-libX11 slitaz-base-files xorg-libICE xorg-libSM \
    2.12 @@ -29,16 +29,16 @@
    2.13  genpkg_rules()
    2.14  {
    2.15  	mkdir -p $fs/usr/lib $fs/usr/share
    2.16 -	cp -a $_pkg/etc $fs
    2.17 -	cp -a $_pkg/var $fs
    2.18 -	cp -a $_pkg/usr/bin $fs/usr
    2.19 -	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    2.20 -	cp -a $_pkg/usr/lib/dbus $fs/usr/lib
    2.21 +	cp -a $install/etc $fs
    2.22 +	cp -a $install/var $fs
    2.23 +	cp -a $install/usr/bin $fs/usr
    2.24 +	cp -a $install/usr/lib/*.so* $fs/usr/lib
    2.25 +	cp -a $install/usr/lib/dbus $fs/usr/lib
    2.26  	# Remove helper (600 Kb).
    2.27  	rm $fs/usr/lib/dbus/dbus-daemon-launch-helper
    2.28 -	cp -a $_pkg/usr/share/dbus* $fs/usr/share
    2.29 +	cp -a $install/usr/share/dbus* $fs/usr/share
    2.30  	# Init script
    2.31 -	cp -a stuff/etc $fs
    2.32 +	cp -a $stuff/etc $fs
    2.33  	chown -R root.root $fs
    2.34  }
    2.35  
    2.36 @@ -69,6 +69,8 @@
    2.37  
    2.38  pre_remove()
    2.39  {
    2.40 -	/etc/init.d/dbus stop
    2.41 -	deluser messagebus
    2.42 +	if [ -z "$1" ]; then
    2.43 +		/etc/init.d/dbus stop
    2.44 +		deluser messagebus
    2.45 +	fi
    2.46  }