- Strip 'zjs' from make-and-model as well (bug #531869).

This commit is contained in:
Tim Waugh 2009-10-29 17:27:33 +00:00
parent 4ce51454e7
commit b10389e413
2 changed files with 17 additions and 1 deletions

View File

@ -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",

View File

@ -7,7 +7,7 @@
Summary: A printer administration tool Summary: A printer administration tool
Name: system-config-printer Name: system-config-printer
Version: 1.1.13 Version: 1.1.13
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/ URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base 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 Patch12: system-config-printer-jobs-window-visibility.patch
Patch13: system-config-printer-strip-zxs-pcl3.patch Patch13: system-config-printer-strip-zxs-pcl3.patch
Patch14: system-config-printer-troubleshoot-network-printers.patch Patch14: system-config-printer-troubleshoot-network-printers.patch
Patch15: system-config-printer-strip-zjs.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4 BuildRequires: python-devel >= 2.4
@ -103,6 +104,7 @@ printers.
%patch12 -p1 -b .jobs-window-visibility %patch12 -p1 -b .jobs-window-visibility
%patch13 -p1 -b .strip-zxs-pcl3 %patch13 -p1 -b .strip-zxs-pcl3
%patch14 -p1 -b .troubleshoot-network-printers %patch14 -p1 -b .troubleshoot-network-printers
%patch15 -p1 -b .strip-zjs
%build %build
%configure --with-udev-rules --with-polkit-1 %configure --with-udev-rules --with-polkit-1
@ -214,6 +216,9 @@ rm -rf %buildroot
exit 0 exit 0
%changelog %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 * Wed Oct 28 2009 Tim Waugh <twaugh@redhat.com> 1.1.13-4
- Troubleshoot: connect to the right server when choosing a network - Troubleshoot: connect to the right server when choosing a network
queue (bug #531482). queue (bug #531482).