From b10389e413daabec7d0784a2c6285cb9e202a128 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Thu, 29 Oct 2009 17:27:33 +0000
Subject: [PATCH] - Strip 'zjs' from make-and-model as well (bug #531869).

---
 system-config-printer-strip-zjs.patch | 11 +++++++++++
 system-config-printer.spec            |  7 ++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 system-config-printer-strip-zjs.patch

diff --git a/system-config-printer-strip-zjs.patch b/system-config-printer-strip-zjs.patch
new file mode 100644
index 0000000..88ec023
--- /dev/null
+++ b/system-config-printer-strip-zjs.patch
@@ -0,0 +1,11 @@
+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",
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 06de609..d73a348 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -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-properties-dialog.patch
 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@redhat.com> 1.1.13-5
+- Strip 'zjs' from make-and-model as well (bug #531869).
+
 * Wed Oct 28 2009 Tim Waugh <twaugh@redhat.com> 1.1.13-4
 - Troubleshoot: connect to the right server when choosing a network
   queue (bug #531482).