[arch-commits] Commit in cups/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Saturday, June 4, 2011 @ 18:35:21
  Author: andyrtr
Revision: 126330

upgpkg: cups 1.4.6-3
add some optional deps for ghostscript and foomatic; FS#24194

Modified:
  cups/trunk/PKGBUILD

----------+
 PKGBUILD |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-04 22:33:44 UTC (rev 126329)
+++ PKGBUILD	2011-06-04 22:35:21 UTC (rev 126330)
@@ -4,7 +4,7 @@
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.4.6
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -25,7 +25,7 @@
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
   # Avahi support in the dnssd backend. patch from Fedora
-  patch -Np1 -i ${srcdir}/cups-avahi.patch || return 1
+  patch -Np1 -i ${srcdir}/cups-avahi.patch
   
   # Rebuild configure script for --enable-avahi.
   aclocal -I config-scripts
@@ -37,7 +37,7 @@
      --disable-ldap --libdir=/usr/lib --enable-raw-printing \
      --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls --disable-threads --enable-avahi\
      --with-php=/usr/bin/php-cgi --with-pdftops=pdftops --with-optim="$CFLAGS"
-  make || return 1
+  make
 }
 
 package_libcups() {
@@ -45,7 +45,7 @@
 depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'krb5' 'avahi')
 
   cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-headers install-libs || return 1
+  make BUILDROOT=${pkgdir} install-headers install-libs
   # put this into the libs pkg to make other software find the libs(no pkg-config file included)
   mkdir -p ${pkgdir}/usr/bin
   install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
@@ -67,10 +67,14 @@
         etc/pam.d/cups
         etc/xinetd.d/cups-lpd)
 depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme')
-optdepends=('php: for included phpcups.so module')
+optdepends=('php: for included phpcups.so module'
+            'ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
+	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
+	    'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly'
+	    'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly')
 
   cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-data install-exec || return 1
+  make BUILDROOT=${pkgdir} install-data install-exec
 
   # this one we ship in the libcups pkg
   rm -f ${pkgdir}/usr/bin/cups-config