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

[andyrtr at archlinux.org]

    Date: Tuesday, June 12, 2012 @ 12:37:56
  Author: andyrtr
Revision: 161630

upgpkg: cups 1.5.3-5

follow upstream recommendation what files to remove for use with cups-filters and fix the filter presettings

Modified:
  cups/trunk/PKGBUILD
  cups/trunk/PKGBUILD.16

-------------+
 PKGBUILD    |   13 ++++++++-----
 PKGBUILD.16 |    5 ++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-12 16:25:16 UTC (rev 161629)
+++ PKGBUILD	2012-06-12 16:37:56 UTC (rev 161630)
@@ -4,7 +4,7 @@
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.5.3
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -163,9 +163,12 @@
   # remove client.conf man page
   rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
   
-  # remove files now part of cups-filters
+  # remove files now part of cups-filters - check cups-filters INSTALL for packagers instructions
   rm -v ${pkgdir}/usr/lib/cups/backend/{parallel,serial}
-  rm -v ${pkgdir}/usr/lib/cups/filter/{commandtoescpx,commandtopclx,imagetops,imagetoraster,pdftops,rastertoescpx,rastertopclx,texttops}
-  rm -v ${pkgdir}/usr/share/cups/banners/{classified,confidential,secret,standard,topsecret,unclassified}
-  rm -v ${pkgdir}/usr/share/cups/data/testprint
+  rm -v ${pkgdir}/usr/lib/cups/filter/{bannertops,commandtoescpx,commandtopclx,imagetops,imagetoraster,pdftops,rastertoescpx,rastertopclx,texttops}
+  rm -v ${pkgdir}/usr/share/cups/banners/*
+  rm -v ${pkgdir}/usr/share/cups/data/{testprint,psglyphs}
+  rm -v ${pkgdir}/usr/share/cups/fonts/*
+  # comment out all conversion rules which use any of the removed filters
+  perl -p -i -e 's:^(.*\s+(pdftops|texttops|imagetops|bannertops|imagetoraster)\s*)$:#\1:' ${pkgdir}/usr/share/cups/mime/mime.convs
 }

Modified: PKGBUILD.16
===================================================================
--- PKGBUILD.16	2012-06-12 16:25:16 UTC (rev 161629)
+++ PKGBUILD.16	2012-06-12 16:37:56 UTC (rev 161630)
@@ -138,6 +138,9 @@
   rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
   
   # remove files now part of cups-filters
-  rm -v ${pkgdir}/usr/share/cups/banners/{classified,confidential,secret,standard,topsecret,unclassified}
+  rm -v ${pkgdir}/usr/lib/cups/filter/bannertops
+  rm -v ${pkgdir}/usr/share/cups/banners/*
   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
 }