From 9d36fcd5638035abf19f303deebd9e861d384254 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 7 Aug 2012 00:01:58 +0000
Subject: Tue Aug  7 00:01:58 UTC 2012

---
 extra/cups/PKGBUILD | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'extra/cups/PKGBUILD')

diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index a1f8b2b04..e6c6d07d3 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164328 2012-07-30 14:40:47Z andyrtr $
+# $Id: PKGBUILD 164782 2012-08-05 08:32:04Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.6.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -15,7 +15,10 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
         cups-no-gcrypt.patch
         cups-no-gzip-man.patch
         cups-systemd-socket.patch
-        cups cups.logrotate cups.pam)
+        cups cups.logrotate cups.pam
+        cupsd-conf-remove-obsolete-browse-directives.patch
+        avahi-missing-in-conditionals.patch
+        recognize-remote-cups-queue-via-dnssd-uri.patch)
 #options=('!emptydirs')
 md5sums=('87ade07e3d1efd03c9c3add949cf9c00'
          '9b8467a1e51d360096b70e2c3c081e6c'
@@ -24,7 +27,10 @@ md5sums=('87ade07e3d1efd03c9c3add949cf9c00'
          'a81573a429b98e16670d7fea47e528c4'
          '9657daa21760bb0b5fa3d8b51d5e01a1'
          'f861b18f4446c43918c8643dcbbd7f6d'
-         '96f82c38f3f540b53f3e5144900acf17')
+         '96f82c38f3f540b53f3e5144900acf17'
+         '6bef262b5081051e88cd2ae94fed1867'
+         '9c91b1319f4b20dc323986cb4abbe806'
+         'dcef8dd5614461166cada8a706eebb49')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -40,6 +46,14 @@ build() {
   patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
   # don't zip man pages in make install, let makepkg do that / Fedora
   patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
+
+  # upstream bugtracker patches
+  # http://www.cups.org/str.php?L4157 - fix broken default server config
+  patch -Np1 -i ${srcdir}/cupsd-conf-remove-obsolete-browse-directives.patch
+  # http://www.cups.org/str.php?L4156 - In many DNS-SD/Bonjour conditionals Avahi is not considered
+  patch -Np1 -i ${srcdir}/avahi-missing-in-conditionals.patch
+  # http://www.cups.org/str.php?L4158 - DNS-SD-based print queues pointing to CUPS server are not considered remote printers with driver on server
+  patch -Np1 -i ${srcdir}/recognize-remote-cups-queue-via-dnssd-uri.patch
   
   # Rebuild configure script for not zipping man-pages.
   aclocal -I config-scripts
@@ -150,4 +164,7 @@ optdepends=('xdg-utils: xdg .desktop file support')
   rm -v ${pkgdir}/usr/share/cups/data/testprint
   # comment out all conversion rules which use any of the removed filters
   perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs
+
+  # Provide native service for arch-daemons generator
+  ln -s cups.service "$pkgdir/usr/lib/systemd/system/cupsd.service"
 }
-- 
cgit v1.2.3-54-g00ecf