wok rev 2206

cups: up to 13.9, fix web interface and dependencies
author Christophe Lincoln <pankso@slitaz.org>
date Tue Feb 10 16:37:43 2009 +0100 (2009-02-10)
parents 2a2e3384a8ce
children 451844bef4f7
files cups-dev/receipt cups/receipt cups/stuff/etc/init.d/cupsd
line diff
     1.1 --- a/cups-dev/receipt	Tue Feb 10 12:14:40 2009 +0000
     1.2 +++ b/cups-dev/receipt	Tue Feb 10 16:37:43 2009 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt."
     1.5  
     1.6  PACKAGE="cups-dev"
     1.7 -VERSION="1.3.7"
     1.8 +VERSION="1.3.9"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="Common UNIX Printing System dev files."
    1.11  MAINTAINER="erjo@slitaz.org"
     2.1 --- a/cups/receipt	Tue Feb 10 12:14:40 2009 +0000
     2.2 +++ b/cups/receipt	Tue Feb 10 16:37:43 2009 +0100
     2.3 @@ -1,12 +1,12 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="cups"
     2.7 -VERSION="1.3.7"
     2.8 +VERSION="1.3.9"
     2.9  CATEGORY="system-tools"
    2.10  SHORT_DESC="Common UNIX Printing System."
    2.11  MAINTAINER="erjo@slitaz.org"
    2.12 -DEPENDS="openssl slitaz-base-files gnutls cyrus-sasl"
    2.13 -BUILD_DEPENDS="openssl-dev"
    2.14 +DEPENDS="openssl slitaz-base-files gnutls ghostscript dbus"
    2.15 +BUILD_DEPENDS="openssl-dev gnutls-dev ghostscript dbus-dev"
    2.16  TARBALL="$PACKAGE-$VERSION-source.tar.bz2"
    2.17  WEB_SITE="http://www.cups.org/"
    2.18  WGET_URL="http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/$VERSION/$TARBALL"
    2.19 @@ -20,7 +20,10 @@
    2.20  		--sysconfdir=/etc \
    2.21  		--localstatedir=/var \
    2.22  		--mandir=/usr/share/man \
    2.23 -		--enable-static \
    2.24 +		--disable-ldap \
    2.25 +		--with-cups-user=nobody \
    2.26 +		--with-cups-group=nogroup \
    2.27 +		--with-languages="de es fr" \
    2.28  		$CONFIGURE_ARGS &&
    2.29  	make &&
    2.30  	make BUILDROOT=$PWD/_pkg install
    2.31 @@ -32,12 +35,16 @@
    2.32  	mkdir -p $fs/etc $fs/usr/lib $fs/usr/share
    2.33  	
    2.34  	cp -a $_pkg/etc/cups $fs/etc
    2.35 +	cp -a $_pkg/etc/dbus* $fs/etc
    2.36  	cp -a $_pkg/usr/bin $fs/usr
    2.37  	cp -a $_pkg/usr/sbin $fs/usr
    2.38  	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    2.39  	cp -a $_pkg/usr/lib/cups $fs/usr/lib
    2.40  	cp -a $_pkg/usr/share/cups $fs/usr/share
    2.41  	cp -a $_pkg/var $fs
    2.42 +	
    2.43 +	# We need the doc for CSS, images and help in the web interface.
    2.44 +	cp -a $_pkg/usr/share/doc $fs/usr/share
    2.45  
    2.46  	# Daemon script
    2.47  	cp -a stuff/etc $fs
     3.1 --- a/cups/stuff/etc/init.d/cupsd	Tue Feb 10 12:14:40 2009 +0000
     3.2 +++ b/cups/stuff/etc/init.d/cupsd	Tue Feb 10 16:37:43 2009 +0100
     3.3 @@ -18,13 +18,12 @@
     3.4  	stop)
     3.5  		echo -n "Stopping $DESC: $NAME... "
     3.6  		killall -q cupsd
     3.7 +		rm -f $PIDFILE
     3.8  		status
     3.9  		;;
    3.10 -	start)
    3.11 -		if ps | grep $DAEMON; then
    3.12 -			echo "$NAME is already running... "
    3.13 -			exit 0
    3.14 -		fi
    3.15 +	start|restart)
    3.16 +		killall -q cupsd
    3.17 +		rm -f $PIDFILE
    3.18  		echo -n "Starting $DESC: $NAME... "
    3.19  		$DAEMON $OPTIONS
    3.20  		status