rpms/system-config-printer/F-12 system-config-printer-strip-zxs-pcl3.patch, NONE, 1.1 system-config-printer.spec, 1.302, 1.303

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19362

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-strip-zxs-pcl3.patch 
Log Message:
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
- Strip 'zxs' and 'pcl3' from make-and-model (bug #531048).


system-config-printer-strip-zxs-pcl3.patch:
 ppds.py |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE system-config-printer-strip-zxs-pcl3.patch ---
diff -up system-config-printer-1.1.13/cupshelpers/ppds.py.strip-zxs-pcl3 system-config-printer-1.1.13/cupshelpers/ppds.py
--- system-config-printer-1.1.13/cupshelpers/ppds.py.strip-zxs-pcl3	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/cupshelpers/ppds.py	2009-10-28 15:53:28.990139713 +0000
@@ -184,6 +184,8 @@ def ppdMakeModelSplit (ppd_make_and_mode
                    " ps3",
                    " pxl",
                    " series",
+                   " zxs",              # hpcups
+                   " pcl3",             # hpcups
                    "_bt",
                    ","]:
         s = modell.find (suffix)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -p -r1.302 -r1.303
--- system-config-printer.spec	28 Oct 2009 15:51:23 -0000	1.302
+++ system-config-printer.spec	28 Oct 2009 15:56:02 -0000	1.303
@@ -27,6 +27,7 @@ Patch9: system-config-printer-autoselect
 Patch10: system-config-printer-network-model.patch
 Patch11: system-config-printer-no-cancel-properties-dialog.patch
 Patch12: system-config-printer-jobs-window-visibility.patch
+Patch13: system-config-printer-strip-zxs-pcl3.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -99,6 +100,7 @@ printers.
 %patch10 -p1 -b .network-model
 %patch11 -p1 -b .no-cancel-properties-dialog
 %patch12 -p1 -b .jobs-window-visibility
+%patch13 -p1 -b .strip-zxs-pcl3
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -211,6 +213,7 @@ exit 0
 
 %changelog
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
+- Strip 'zxs' and 'pcl3' from make-and-model (bug #531048).
 - Fixed visibility tracking for jobs window (bug #531438).
 - Don't display properties dialog for first test page (bug #531490).
 - Determine make/model for network printers (bug #524321).