rpms/system-config-printer/F-12 system-config-printer-editable-ppd.patch, NONE, 1.1 system-config-printer.spec, 1.314, 1.315

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-editable-ppd.patch 
Log Message:
* Thu Nov 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-12
- Fixed editability of PPD options for explicit IPP queues
  (bug #541588).


system-config-printer-editable-ppd.patch:
 system-config-printer.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE system-config-printer-editable-ppd.patch ---
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()


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -p -r1.314 -r1.315
--- system-config-printer.spec	23 Nov 2009 13:25:11 -0000	1.314
+++ system-config-printer.spec	26 Nov 2009 15:30:10 -0000	1.315
@@ -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-typ
 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 <twaugh at redhat.com> 1.1.13-12
+- Fixed editability of PPD options for explicit IPP queues
+  (bug #541588).
+
 * Mon Nov 23 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.13-11
 - Prevent traceback when PackageKit is not installed (bug #540230).