From c45779c0d55a09a11a2f26bcebffa3dc27c3262f Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Wed, 8 Feb 2012 14:19:26 +0100
Subject: Update ~mtjm/cups-usblp.

---
 ~mtjm/cups-usblp/PKGBUILD | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

(limited to '~mtjm/cups-usblp/PKGBUILD')

diff --git a/~mtjm/cups-usblp/PKGBUILD b/~mtjm/cups-usblp/PKGBUILD
index 43687b104..5f1c62325 100644
--- a/~mtjm/cups-usblp/PKGBUILD
+++ b/~mtjm/cups-usblp/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 135897 2011-08-20 06:24:46Z andyrtr $
+# $Id: PKGBUILD 149429 2012-02-07 16:59:12Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 _pkgname="cups"
 pkgname="cups-usblp"
-pkgver=1.5.0
-pkgrel=1.1
-pkgdesc="The CUPS Printing System - daemon package, with usblp backend"
+pkgver=1.5.2
+pkgrel=1
+pkgdesc="The CUPS Printing System - daemon package with usblp backend"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.cups.org/"
 depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'dbus-core' 'hicolor-icon-theme')
-makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3'
+makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3'
              'xinetd' 'gzip' 'autoconf' 'php' 'dbus-core' 'avahi'  'hicolor-icon-theme')
 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'
 	    'xdg-utils: xdg .desktop file support')
-provides=("${_pkgname}=${pkgver}")
-conflicts=("${_pkgname}")
+provides=("cups=${pkgver}")
+conflicts=("cups" "cups-libre")
 backup=(etc/cups/cupsd.conf
         etc/cups/mime.convs
         etc/cups/mime.types
@@ -33,13 +33,21 @@ backup=(etc/cups/cupsd.conf
         etc/xinetd.d/cups-lpd)
 install=cups.install
 source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
-	cups-avahi.patch
+        cups-avahi-1-config.patch
+        cups-avahi-2-backend.patch
+        cups-avahi-3-timeouts.patch
+        cups-avahi-4-poll.patch
+        cups-avahi-5-services.patch
         cups-no-export-ssllibs.patch
         cups-no-gcrypt.patch
         cups cups.logrotate cups.pam)
 #options=('!emptydirs')
-md5sums=('e54ed09ede2340fc3014913333520fe4'
-         'e0843e8d8c345792ac73a185260e69fe'
+md5sums=('9471d2a7c920cfbb17133c32d2e6866f'
+         '8496c48a7ab5918ce546cfb72472def3'
+         '7df4c2e0a69bf072d7b7e96523df9dce'
+         '9a207c5d5189b1c2fc55907b7ed09372'
+         '5da4ba0837f9a685f146797fcfcd455e'
+         'fe782a8fd4351741120d485d476abe8a'
          '9b8467a1e51d360096b70e2c3c081e6c'
          '3733c23e77eb503bd94cc368e02830dc'
          '9657daa21760bb0b5fa3d8b51d5e01a1'
@@ -50,8 +58,13 @@ md5sums=('e54ed09ede2340fc3014913333520fe4'
 
 build() {
   cd ${srcdir}/${_pkgname}-${pkgver}
-  # Avahi support in the dnssd backend. patch from Debian based on the Fedora work but brings it in a single file http://patch-tracker.debian.org/package/cups
-  patch -Np1 -i ${srcdir}/cups-avahi.patch
+  # http://www.cups.org/str.php?L3066
+  # Avahi support in the dnssd backend. patches from upstream/FC RawHide
+  patch -Np1 -i ${srcdir}/cups-avahi-1-config.patch
+  patch -Np1 -i ${srcdir}/cups-avahi-2-backend.patch
+  patch -Np1 -i ${srcdir}/cups-avahi-3-timeouts.patch
+  patch -Np1 -i ${srcdir}/cups-avahi-4-poll.patch
+  patch -Np1 -i ${srcdir}/cups-avahi-5-services.patch
 
   # Do not export SSL libs in cups-config
   patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
-- 
cgit v1.2.3-54-g00ecf