wok diff cups-pam/receipt @ rev 14624

Up: hplip to 3.12.11.
author Christopher Rogers <slaxemulator@gmail.com>
date Sat Jun 01 10:21:01 2013 +0000 (2013-06-01)
parents 69557c05e267
children a6452de6a141
line diff
     1.1 --- a/cups-pam/receipt	Sat Jan 26 17:13:50 2013 +0100
     1.2 +++ b/cups-pam/receipt	Sat Jun 01 10:21:01 2013 +0000
     1.3 @@ -1,13 +1,14 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="cups-pam"
     1.7 -VERSION="1.5.3"
     1.8 +VERSION="1.6.1"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="Common UNIX Printing System with pam support."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 -DEPENDS="openssl slitaz-base-files gnutls ghostscript dbus jpeg libpng tiff \
    1.13 +DEPENDS="libssl libgcrypt cups-doc slitaz-base-files gnutls dbus jpeg libpng tiff \
    1.14  zlib pam libcomerr libkrb5 acl libcomerr3"
    1.15 -BUILD_DEPENDS="openssl-dev gnutls-dev ghostscript dbus-dev pam pam-dev acl-dev"
    1.16 +BUILD_DEPENDS="openssl-dev gnutls-dev dbus-dev jpeg-dev libpng-dev tiff-dev \
    1.17 +pam libcomerr-dev pam-dev acl-dev libgcrypt-dev"
    1.18  SOURCE="cups"
    1.19  TARBALL="$SOURCE-$VERSION-source.tar.bz2"
    1.20  WEB_SITE="http://www.cups.org/"
    1.21 @@ -18,7 +19,7 @@
    1.22  compile_rules()
    1.23  {
    1.24  	cd $src
    1.25 -	patch -p1 < $stuff/install-sh.u
    1.26 +	patch -Np1 -i $WOK/$SOURCE/stuff/install-sh.u
    1.27  	./configure \
    1.28  		--prefix=/usr \
    1.29  		--sysconfdir=/etc \
    1.30 @@ -32,7 +33,7 @@
    1.31  		--with-languages="de es fr" \
    1.32  		$CONFIGURE_ARGS &&
    1.33  	make &&
    1.34 -	make BUILDROOT=$PWD/_pkg install
    1.35 +	make BUILDROOT=$DESTDIR install
    1.36  }
    1.37  
    1.38  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.39 @@ -40,19 +41,16 @@
    1.40  {
    1.41  	mkdir -p $fs/etc $fs/usr/lib $fs/usr/share/pixmaps
    1.42  	
    1.43 -	cp -a $_pkg/etc/cups $fs/etc
    1.44 -	cp -a $_pkg/etc/dbus* $fs/etc
    1.45 -	cp -a $_pkg/usr/bin $fs/usr
    1.46 -	cp -a $_pkg/usr/sbin $fs/usr
    1.47 -	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    1.48 -	cp -a $_pkg/usr/lib/cups $fs/usr/lib
    1.49 -	cp -a $_pkg/usr/share/cups $fs/usr/share
    1.50 -	cp -a $_pkg/usr/share/icons/hicolor/32x32/apps/cups.png \
    1.51 +	cp -a $install/etc/cups $fs/etc
    1.52 +	cp -a $install/etc/dbus* $fs/etc
    1.53 +	cp -a $install/usr/bin $fs/usr
    1.54 +	cp -a $install/usr/sbin $fs/usr
    1.55 +	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.56 +	cp -a $install/usr/lib/cups $fs/usr/lib
    1.57 +	cp -a $install/usr/share/cups $fs/usr/share
    1.58 +	cp -a $install/usr/share/icons/hicolor/32x32/apps/cups.png \
    1.59  		 $fs/usr/share/pixmaps
    1.60 -	cp -a $_pkg/var $fs
    1.61 -	
    1.62 -	# We need the doc for CSS, images and help in the web interface.
    1.63 -	cp -a $_pkg/usr/share/doc $fs/usr/share
    1.64 +	cp -a $install/var $fs
    1.65  
    1.66  	# tazwok does not strip files other than .so in usr/lib
    1.67  		
    1.68 @@ -88,7 +86,11 @@
    1.69  # Stop cups daemon before rm.
    1.70  pre_remove()
    1.71  {
    1.72 -	[ -z "$1" ] && [ -x /etc/init.d/cupsd ] && /etc/init.d/cupsd stop
    1.73 +	local root
    1.74 +	root=$1
    1.75 +	if [ -z "$root" ]; then
    1.76 +		/etc/init.d/cupsd stop
    1.77 +	fi
    1.78  }
    1.79  
    1.80  # Overlap busybox