From ee852c24691806c1b74263bedd8373fb78d452e7 Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Fri, 7 Jan 2011 14:08:01 +0100
Subject: [PATCH] cups: update to 1.4.6

the configure options --without-{menudir,icondir} doesn't work as
expected, because the stuff goes into a ${PKG}no directory while
make install. Deleted the options and added a manual remove.
---
 cups/.md5sum | 2 +-
 cups/Pkgfile | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cups/.md5sum b/cups/.md5sum
index a0c25adef..74079f6b5 100644
--- a/cups/.md5sum
+++ b/cups/.md5sum
@@ -1,4 +1,4 @@
 01b6a755c5b0fb7df2d2c94571f67e1d  cups
-50729f6fc46ba54223e0eaf5009f3419  cups-1.4.5-source.tar.bz2
+de8fb5a29c36554925c0c6a6e2c0dae1  cups-1.4.6-source.tar.bz2
 2220f411940c4f7504ed4457c6304d4a  cups-config.patch
 4a94252a0deb74c6fe12f373be576182  usb-backend-both-usblp-and-libusb.dpatch
diff --git a/cups/Pkgfile b/cups/Pkgfile
index b9bc8d6d5..a0a91e053 100644
--- a/cups/Pkgfile
+++ b/cups/Pkgfile
@@ -4,8 +4,8 @@
 # Depends on:  acl tcp_wrappers libusb-compat libpng libtiff openssl
 
 name=cups
-version=1.4.5
-release=3
+version=1.4.6
+release=1
 source=(http://ftp.easysw.com/pub/cups/$version/$name-$version-source.tar.bz2
         cups-config.patch cups usb-backend-both-usblp-and-libusb.dpatch)
 
@@ -25,7 +25,7 @@ build () {
                 --with-cups-group=lp \
                 --with-languages="" \
                 --without-{java,perl,php,python} \
-                --without-{rcdir,menudir,icondir}  \
+                --without-rcdir \
                 --with-optim="$CFLAGS" \
                 --with-pdftops=none \
                 --enable-{ssl,openssl} --disable-gnutls \
@@ -36,6 +36,7 @@ build () {
     make
     make BUILDROOT=$PKG install
 
+    rm -r $PKG/usr/share/{applications,icons}
     chmod 0755 $PKG/var/{cache,spool}   
     chmod -R +w $PKG