rpms/system-config-printer/F-12 system-config-printer-strip-zjs.patch, NONE, 1.1 system-config-printer.spec, 1.304, 1.305

Tim Waugh twaugh at fedoraproject.org
Thu Oct 29 17:26:45 UTC 2009


Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-strip-zjs.patch 
Log Message:
* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
- Strip 'zjs' from make-and-model as well (bug #531869).


system-config-printer-strip-zjs.patch:
 ppds.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-strip-zjs.patch ---
diff -up system-config-printer-1.1.13/cupshelpers/ppds.py.strip-zjs system-config-printer-1.1.13/cupshelpers/ppds.py
--- system-config-printer-1.1.13/cupshelpers/ppds.py.strip-zjs	2009-10-29 16:51:28.575897013 +0000
+++ system-config-printer-1.1.13/cupshelpers/ppds.py	2009-10-29 17:18:17.526021102 +0000
@@ -184,6 +184,7 @@ def ppdMakeModelSplit (ppd_make_and_mode
                    " ps3",
                    " pxl",
                    " series",
+                   " zjs",              # hpcups
                    " zxs",              # hpcups
                    " pcl3",             # hpcups
                    "_bt",


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -p -r1.304 -r1.305
--- system-config-printer.spec	28 Oct 2009 15:59:51 -0000	1.304
+++ system-config-printer.spec	29 Oct 2009 17:26:45 -0000	1.305
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -29,6 +29,7 @@ Patch11: system-config-printer-no-cancel
 Patch12: system-config-printer-jobs-window-visibility.patch
 Patch13: system-config-printer-strip-zxs-pcl3.patch
 Patch14: system-config-printer-troubleshoot-network-printers.patch
+Patch15: system-config-printer-strip-zjs.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -103,6 +104,7 @@ printers.
 %patch12 -p1 -b .jobs-window-visibility
 %patch13 -p1 -b .strip-zxs-pcl3
 %patch14 -p1 -b .troubleshoot-network-printers
+%patch15 -p1 -b .strip-zjs
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -214,6 +216,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
+- Strip 'zjs' from make-and-model as well (bug #531869).
+
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
 - Troubleshoot: connect to the right server when choosing a network
   queue (bug #531482).




More information about the fedora-extras-commits mailing list