SliTaz Repositories

     1.1 --- a/cups/receipt	Wed Nov 08 13:44:17 2017 +0200
     1.2 +++ b/cups/receipt	Thu Nov 09 21:37:23 2017 +0100
     1.3 @@ -20,14 +20,14 @@
     1.4  {
     1.5  	# gid 19 suggested by the BLFS is in use in SliTaz (by cdrom group),
     1.6  	# using 23 instead
     1.7 -	addgroup -g 23 lpadmin &&
     1.8 +	addgroup -g 23 lpadmin
     1.9  
    1.10 -	sed -i 's:555:755:g;s:444:644:g' Makedefs.in &&
    1.11 -	sed -i '/MAN.EXT/s:.gz::g' configure config-scripts/cups-manpages.m4 &&
    1.12 -	sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4 &&
    1.13 +	sed -i 's:555:755:g;s:444:644:g' Makedefs.in
    1.14 +	sed -i '/MAN.EXT/s:.gz::g' configure config-scripts/cups-manpages.m4
    1.15 +	sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4
    1.16  
    1.17 -	aclocal  -I config-scripts &&
    1.18 -	autoconf -I config-scripts &&
    1.19 +	aclocal  -I config-scripts
    1.20 +	autoconf -I config-scripts
    1.21  
    1.22  	cp -a $src $src-pam
    1.23  
    1.24 @@ -43,9 +43,9 @@
    1.25  		--with-docdir=/usr/share/doc/cups-$VERSION \
    1.26  		$CONFIGURE_ARGS &&
    1.27  	make &&
    1.28 -	make BUILDROOT=$install install &&
    1.29 +	make BUILDROOT=$install install || return 1
    1.30  
    1.31 -	cd $src-pam &&
    1.32 +	cd $src-pam
    1.33  	CC=gcc \
    1.34  	./configure \
    1.35  		--sysconfdir=/etc \
    1.36 @@ -58,7 +58,7 @@
    1.37  		--with-docdir=/usr/share/doc/cups-$VERSION \
    1.38  		$CONFIGURE_ARGS &&
    1.39  	make &&
    1.40 -	make BUILDROOT=$install-pam install &&
    1.41 +	make BUILDROOT=$install-pam install || return 1
    1.42  
    1.43  	for inst in $install $install-pam ; do
    1.44  		rm -rf $inst/tmp &&
    1.45 @@ -109,16 +109,16 @@
    1.46  			DEPENDS="libgnutls zlib"
    1.47  			;;
    1.48  		cups)
    1.49 -			copy @std var/ # copy empty dirs in var/
    1.50 -			remove_already_packed
    1.51 +			copy @std @rm
    1.52  			DEPENDS="acl dbus libcups libgnutls libusb zlib"
    1.53  			CONFIG_FILES="/etc/cups/"
    1.54  			TAGS="printer printing"
    1.55  			;;
    1.56  		cups-pam)
    1.57  			install=$install-pam \
    1.58 -			copy @std var/ # copy empty dirs in var/
    1.59 +			copy @std
    1.60  			rm -f $fs/usr/lib/libcups.so*
    1.61 +			CAT="system-tools|with PAM support"
    1.62  			DEPENDS="acl dbus libcups libgnutls libusb zlib pam"
    1.63  			PROVIDE="cups:pam"
    1.64  			CONFIG_FILES="/etc/cups/"