From 3676e63d58c2e1edf2a5cb82f4eed68292936717 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 26 Nov 2009 15:31:13 +0000 Subject: [PATCH] - Fixed editability of PPD options for explicit IPP queues (bug #541588). --- system-config-printer-editable-ppd.patch | 20 ++++++++++++++++++++ system-config-printer.spec | 8 +++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 system-config-printer-editable-ppd.patch diff --git a/system-config-printer-editable-ppd.patch b/system-config-printer-editable-ppd.patch new file mode 100644 index 0000000..1daf27a --- /dev/null +++ b/system-config-printer-editable-ppd.patch @@ -0,0 +1,20 @@ +diff -up system-config-printer-1.1.13/system-config-printer.py.editable-ppd system-config-printer-1.1.13/system-config-printer.py +--- system-config-printer-1.1.13/system-config-printer.py.editable-ppd 2009-11-26 15:27:29.844177855 +0000 ++++ system-config-printer-1.1.13/system-config-printer.py 2009-11-26 15:27:42.803179141 +0000 +@@ -2320,7 +2320,6 @@ class GUI(GtkGUI, monitor.Watcher): + pass + + editable = not self.printer.discovered +- editablePPD = not self.printer.remote + + try: + self.ppd = printer.getPPD() +@@ -2471,7 +2470,7 @@ class GUI(GtkGUI, monitor.Watcher): + self.fillClassMembers(name, editable) + else: + # real Printer +- self.fillPrinterOptions(name, editablePPD) ++ self.fillPrinterOptions(name, editable) + + self.updateMarkerLevels() + self.updateStateReasons() diff --git a/system-config-printer.spec b/system-config-printer.spec index c5e6cab..8354475 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: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base @@ -37,6 +37,7 @@ Patch19: system-config-printer-de.po-typo.patch Patch20: system-config-printer-test-page-traceback.patch Patch21: system-config-printer-install-foomatic-db-ppds.patch Patch22: system-config-printer-gpk-traceback.patch +Patch23: system-config-printer-editable-ppd.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -118,6 +119,7 @@ printers. %patch20 -p1 -b .test-page-traceback %patch21 -p1 -b .install-foomatic-db-ppds %patch22 -p1 -b .gpk-traceback +%patch23 -p1 -b .editable-ppd %build %configure --with-udev-rules --with-polkit-1 @@ -229,6 +231,10 @@ rm -rf %buildroot exit 0 %changelog +* Thu Nov 26 2009 Tim Waugh 1.1.13-12 +- Fixed editability of PPD options for explicit IPP queues + (bug #541588). + * Mon Nov 23 2009 Jiri Popelka 1.1.13-11 - Prevent traceback when PackageKit is not installed (bug #540230).