# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1504821191 -10800
# Node ID 7ae7ca392d9e6bfea1dd93e88e7612e7b9dd364b
# Parent  e64ba2957d7715b2e21ed5c9516877d555a6ffe9
Small fixes: dbus, dropbear, libgphoto2, openbox-max, slitaz-configs, tazwikiss, wireless_tools

diff -r e64ba2957d77 -r 7ae7ca392d9e dbus/receipt
--- a/dbus/receipt	Thu Sep 07 23:39:42 2017 +0300
+++ b/dbus/receipt	Fri Sep 08 00:53:11 2017 +0300
@@ -26,6 +26,7 @@
 		--disable-static \
 		--disable-systemd \
 		--without-systemdsystemunitdir \
+		--with-console-auth-dir=/run/console/ \
 		--docdir=/usr/share/doc/dbus-$VERSION \
 		$CONFIGURE_ARGS &&
 	make && make -j1 install
@@ -61,7 +62,7 @@
 	if ! grep -qs 'messagebus' "$1/etc/passwd"; then
 		action 'Adding user: messagebus...'
 		chroot "$1/" addgroup -g25 -S messagebus
-		chroot "$1/" adduser -h/var/run/dbus -S -D -u25 -G25 \
+		chroot "$1/" adduser -h/var/run/dbus -S -D -u25 -G messagebus \
 			-g"D-Bus Message Daemon User" messagebus
 		status
 	fi
diff -r e64ba2957d77 -r 7ae7ca392d9e dropbear/receipt
--- a/dropbear/receipt	Thu Sep 07 23:39:42 2017 +0300
+++ b/dropbear/receipt	Fri Sep 08 00:53:11 2017 +0300
@@ -116,7 +116,7 @@
 	grep -q ssh "$1/etc/inetd.conf" || cat >> "$1/etc/inetd.conf" <<EOT
 #ssh	stream	tcp	nowait	root	dropbear	dropbear	-i -b /etc/dropbear/banner
 EOT
-	[ -z "$quiet" ] || return
+	[ -n "$quiet" ] && return
 	cat <<EOT
 
 	.-------------------------------------------------.
diff -r e64ba2957d77 -r 7ae7ca392d9e libgphoto2/receipt
--- a/libgphoto2/receipt	Thu Sep 07 23:39:42 2017 +0300
+++ b/libgphoto2/receipt	Fri Sep 08 00:53:11 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="libgphoto2"
 VERSION="2.5.13"
@@ -7,16 +7,12 @@
 MAINTAINER="jozee@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.gphoto.org/"
-TAGS="camera photo"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/gphoto/$TARBALL"
 
-DEPENDS="eudev libexif libjpeg-turbo libltdl liblzma libusb libxml2 zlib"
-BUILD_DEPENDS="jpeg-dev libexif-dev libtool libexif jpeg libusb libusb-dev \
-libusb-compat libusb-compat-dev pkg-config"
-
 BUILD_DEPENDS="libtool gettext libjpeg-turbo-dev libexif-dev libusb-dev"
+SPLIT="libgphoto2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -35,12 +31,22 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	copy *.so* print-camera-list check-ptp-camera konica/ vcamera/
-	rm -rf $fs/usr/share/doc	# *.so* files here
+	case $PACKAGE in
+		libgphoto2)
+			copy @std
+			DEPENDS="eudev libexif libjpeg-turbo libltdl liblzma libusb \
+			libxml2 zlib"
+			TAGS="camera photo"
+			;;
+		libgphoto2-dev)
+			copy @dev
+			DEPENDS="libgphoto2 eudev-dev libjpeg-turbo-dev libexif-dev \
+			libtool libusb-dev libxml2-dev xz-dev zlib"
+			;;
+	esac
 }
 
-post_install()
-{
+post_install_libgphoto2() {
 	HAL_FDI="$1/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi"
 	UDEV_RULE="$1/etc/udev/rules.d/70-libgphoto2.rules"
 	CAM_LIST="$1/usr/lib/libgphoto2/print-camera-list"
@@ -57,7 +63,9 @@
 	#udev rule
 	"$CAM_LIST" udev-rules version 0.98 group camera mode 0660 > "$UDEV_RULE"
 
-	tazpkg reconfigure eudev --root="$1"
+	[ -z "$1" ] || mount -o bind /dev "$1/dev"
+	chroot "$1/" tazpkg reconfigure eudev
+	[ -z "$1" ] || umount "$1/dev"
 
 	# add group camera
 	if ! grep -q camera "$1/etc/group"; then
@@ -70,7 +78,6 @@
 EOT
 }
 
-post_remove()
-{
+post_remove_libgphoto2() {
 	chroot "$1/" delgroup camera
 }
diff -r e64ba2957d77 -r 7ae7ca392d9e openbox-max/receipt
--- a/openbox-max/receipt	Thu Sep 07 23:39:42 2017 +0300
+++ b/openbox-max/receipt	Fri Sep 08 00:53:11 2017 +0300
@@ -50,6 +50,6 @@
 }
 
 pre_install() {
-	[ -d "$1/var/lib/tazpkg/installed/openbox" ] &&
+	[ ! -d "$1/var/lib/tazpkg/installed/openbox" ] ||
 		tazpkg -r openbox --root="$1/"
 }
diff -r e64ba2957d77 -r 7ae7ca392d9e slitaz-configs/receipt
--- a/slitaz-configs/receipt	Thu Sep 07 23:39:42 2017 +0300
+++ b/slitaz-configs/receipt	Fri Sep 08 00:53:11 2017 +0300
@@ -147,7 +147,7 @@
 	chroot "$1/" slim-theme -f slitaz
 }
 
-post_install_slitaz_configs_base() {
+post_install_slitaz_configs() {
 	for i in $(ls -d "$1/root" "$1"/home/* 2>/dev/null); do
 		[ -d "$i" ] && cp -f "$1/etc/skel/.xinitrc" "$i"
 	done
diff -r e64ba2957d77 -r 7ae7ca392d9e tazwikiss/receipt
--- a/tazwikiss/receipt	Thu Sep 07 23:39:42 2017 +0300
+++ b/tazwikiss/receipt	Fri Sep 08 00:53:11 2017 +0300
@@ -104,5 +104,6 @@
 		fi
 	fi
 
-	[ -z "$quiet" ] && echo -e "The default password to edit pages is 'test'\n"
+	[ -n "$quiet" ] && return
+	echo -e "The default password to edit pages is 'test'\n"
 }
diff -r e64ba2957d77 -r 7ae7ca392d9e wireless_tools/receipt
--- a/wireless_tools/receipt	Thu Sep 07 23:39:42 2017 +0300
+++ b/wireless_tools/receipt	Fri Sep 08 00:53:11 2017 +0300
@@ -35,7 +35,8 @@
 
 post_install_wireless_tools()
 {
-	[ -z "$quiet" ] && cat <<EOT
+	[ -n "$quiet" ] && return
+	cat <<EOT
 You may need to install linux-wireless to have wireless network drivers.
 Or install tazndis to use Windows drivers.
 EOT