SliTaz Repositories

     1.1 --- a/cups-pam/receipt	Thu Apr 02 09:51:00 2015 -0400
     1.2 +++ b/cups-pam/receipt	Thu Dec 17 05:25:15 2015 +0200
     1.3 @@ -3,7 +3,7 @@
     1.4  PACKAGE="cups-pam"
     1.5  VERSION="2.0.2"
     1.6  CATEGORY="system-tools"
     1.7 -SHORT_DESC="Common UNIX Printing System with pam support."
     1.8 +SHORT_DESC="Common UNIX Printing System with PAM support."
     1.9  MAINTAINER="pascal.bellard@slitaz.org"
    1.10  LICENSE="GPL2 LGPL2"
    1.11  SOURCE="cups"
    1.12 @@ -12,15 +12,13 @@
    1.13  WGET_URL="http://www.cups.org/software/$VERSION/$TARBALL"
    1.14  PROVIDE="cups:pam"
    1.15  
    1.16 -DEPENDS="libssl libgcrypt cups-doc slitaz-base-files gnutls dbus jpeg libpng tiff \
    1.17 -zlib pam libcomerr libkrb5 acl libcomerr3 cups-filters"
    1.18 +DEPENDS="pam cups-filters libcups"
    1.19  BUILD_DEPENDS="openssl-dev gnutls-dev dbus-dev jpeg-dev libpng-dev tiff-dev \
    1.20  pam libcomerr-dev pam-dev acl-dev libgcrypt-dev"
    1.21  
    1.22  # Rules to configure and make the package.
    1.23  compile_rules()
    1.24  {
    1.25 -	cd $src
    1.26  	patch -Np1 -i ${WOK}/cups/stuff/install-sh.u
    1.27  	./configure \
    1.28  		--prefix=/usr \
    1.29 @@ -36,13 +34,14 @@
    1.30  		$CONFIGURE_ARGS &&
    1.31  	make &&
    1.32  	make BUILDROOT=$DESTDIR install
    1.33 +	cp -f $WOK/cups/stuff/cups.desktop $install/usr/share/applications/cups.desktop
    1.34  }
    1.35  
    1.36  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.37  genpkg_rules()
    1.38  {
    1.39 -	mkdir -p $fs/etc $fs/usr/lib $fs/usr/share/pixmaps
    1.40 -	
    1.41 +	mkdir -p $fs/etc $fs/usr/lib $fs/usr/share
    1.42 +
    1.43  	cp -a $install/etc/cups $fs/etc
    1.44  	cp -a $install/etc/dbus* $fs/etc
    1.45  	cp -a $install/usr/bin $fs/usr
    1.46 @@ -50,53 +49,50 @@
    1.47  	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.48  	cp -a $install/usr/lib/cups $fs/usr/lib
    1.49  	cp -a $install/usr/share/cups $fs/usr/share
    1.50 -	cp -a $install/usr/share/icons/hicolor/32x32/apps/cups.png \
    1.51 -		 $fs/usr/share/pixmaps
    1.52 +	cp -a $install/usr/share/icons $fs/usr/share
    1.53  	cp -a $install/var $fs
    1.54 -	
    1.55 +
    1.56  	# Remove files provided by cups-filters
    1.57  	rm -f $fs/usr/share/cups/banners/*
    1.58  	rm -f $fs/usr/share/cups/data/testprint
    1.59 -	
    1.60 +
    1.61 +	# Remove files provided by libcups
    1.62 +	rm -f $fs/usr/lib/libcups.so*
    1.63 +
    1.64  	# PAM conf
    1.65  	cp -a $stuff/etc $fs
    1.66  
    1.67  	# Daemon script
    1.68 -	cp -a ${WOK}/cups/stuff/etc $fs
    1.69 +	cp -a $WOK/cups/stuff/etc $fs
    1.70 +
    1.71 +	# TazPanel link
    1.72 +	cp -a $WOK/cups/stuff/var $fs
    1.73 +
    1.74  }
    1.75  
    1.76 -# Start cups daemon and edit daemons.conf.
    1.77  post_install()
    1.78  {
    1.79 -	local root
    1.80 -	root=$1
    1.81 -	if [ -z "$root" ]; then
    1.82 +	# Start CUPS daemon and edit daemons.conf
    1.83 +	if [ -z "$1" -a ! -s /aufs-umount.sh ]; then
    1.84  		/etc/init.d/cupsd start || continue
    1.85  	fi
    1.86 -	if ! grep -q ^CUPSD_OPTIONS $root/etc/daemons.conf; then
    1.87 -		echo '# Cups printing daemon options.' >> $root/etc/daemons.conf
    1.88 -		echo 'CUPSD_OPTIONS=""' >> $root/etc/daemons.conf
    1.89 -		echo '' >> $root/etc/daemons.conf
    1.90 +	if ! grep -q ^CUPSD_OPTIONS "$1/etc/daemons.conf"; then
    1.91 +		cat >> "$1/etc/daemons.conf" <<EOT
    1.92 +# CUPS printing daemon options.
    1.93 +CUPSD_OPTIONS=""
    1.94 +
    1.95 +EOT
    1.96  	fi
    1.97  }
    1.98  
    1.99 -# Stop cups daemon before rm.
   1.100  pre_remove()
   1.101  {
   1.102 -	local root
   1.103 -	root=$1
   1.104 -	if [ -z "$root" -a -x /etc/init.d/cupsd ]; then
   1.105 -		/etc/init.d/cupsd stop
   1.106 -	fi
   1.107 -}
   1.108 -
   1.109 -# Overlap busybox
   1.110 -pre_install()
   1.111 -{
   1.112 -	rm -f $1/usr/bin/lpr
   1.113 +	# Stop CUPS daemon before rm.
   1.114 +	[ -z "$1" -a -x /etc/init.d/cupsd ] && /etc/init.d/cupsd stop
   1.115 +	:
   1.116  }
   1.117  
   1.118  post_remove()
   1.119  {
   1.120 -	ln -s /bin/busybox $1/usr/bin/lpr
   1.121 +	ln -s /bin/busybox "$1/usr/bin/lpr"
   1.122  }