rpms/system-config-printer/F-8 system-config-printer-0.7.74.x.patch, 1.11, 1.12 system-config-printer.spec, 1.168, 1.169

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13278

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-0.7.74.x.patch 
Log Message:
* Fri Apr 18 2008 Tim Waugh <twaugh at redhat.com> 0.7.74.12-2
- Include small fix from upstream for bug #411836.


system-config-printer-0.7.74.x.patch:

Index: system-config-printer-0.7.74.x.patch
===================================================================
RCS file: system-config-printer-0.7.74.x.patch
diff -N system-config-printer-0.7.74.x.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ system-config-printer-0.7.74.x.patch	18 Apr 2008 15:15:18 -0000	1.12
@@ -0,0 +1,36 @@
+diff -up system-config-printer-0.7.74.12/system-config-printer.py.0.7.74.x system-config-printer-0.7.74.12/system-config-printer.py
+--- system-config-printer-0.7.74.12/system-config-printer.py.0.7.74.x	2008-04-18 12:36:55.000000000 +0100
++++ system-config-printer-0.7.74.12/system-config-printer.py	2008-04-18 16:13:48.000000000 +0100
+@@ -3514,6 +3514,22 @@ class GUI:
+             except:
+                 nonfatalException()
+ 
++            # Also check to see whether the media option has become
++            # invalid.  This can happen if it had previously been
++            # explicitly set to a page size that is not offered with
++            # the new PPD (see bug #441836).
++            try:
++                option = self.server_side_options['media']
++                if option.get_current_value () == None:
++                    debugprint ("Invalid media option: resetting")
++                    option.reset ()
++                    self.changed.add (option)
++                    self.save_printer (self.printer)
++            except KeyError:
++                pass
++            except:
++                nonfatalException()
++
+     def checkDriverExists(self, name, ppd=None):
+         """Check that the driver for an existing queue actually
+         exists, and prompt to install the appropriate package
+diff -U0 system-config-printer-0.7.74.12/ChangeLog.0.7.74.x system-config-printer-0.7.74.12/ChangeLog
+--- system-config-printer-0.7.74.12/ChangeLog.0.7.74.x	2008-04-18 12:36:55.000000000 +0100
++++ system-config-printer-0.7.74.12/ChangeLog	2008-04-18 16:13:48.000000000 +0100
+@@ -2,0 +3,6 @@
++	* system-config-printer.py (NewPrinterGUI.on_btnNPApply_clicked):
++	Reset 'media' default job option if it becomes invalid (bug
++	#441836).
++
++2008-04-18  Tim Waugh  <twaugh at redhat.com>
++


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-8/system-config-printer.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- system-config-printer.spec	18 Apr 2008 14:18:01 -0000	1.168
+++ system-config-printer.spec	18 Apr 2008 15:15:18 -0000	1.169
@@ -3,7 +3,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 0.7.74.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -11,6 +11,7 @@
 Source1: pycups-%{pycups_version}.tar.bz2
 Source2: system-config-printer.pam
 Source3: system-config-printer.console
+Patch0: system-config-printer-0.7.74.x.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -52,6 +53,7 @@
 
 %prep
 %setup -q -a 1
+%patch0 -p1 -b .0.7.74.x
 
 %build
 %configure
@@ -124,6 +126,9 @@
 exit 0
 
 %changelog
+* Fri Apr 18 2008 Tim Waugh <twaugh at redhat.com> 0.7.74.12-2
+- Include small fix from upstream for bug #411836.
+
 * Fri Apr 18 2008 Tim Waugh <twaugh at redhat.com> 0.7.74.12-1
 - Updated pycups to 1.9.38.
 - 0.7.74.12: