rpms/system-config-printer/F-8 system-config-printer-0.7.74.x.patch, 1.3, 1.4 system-config-printer.spec, 1.138, 1.139

[Tim Waugh (twaugh)]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-0.7.74.x.patch 
Log Message:
* Wed Oct  3 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.4-2
- Include two more fixes from stable branch.


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	4 Oct 2007 11:37:02 -0000	1.4
@@ -0,0 +1,54 @@
+Index: my-default-printer.py
+===================================================================
+--- my-default-printer.py	(.../tags/0.7.74.4)	(revision 1654)
++++ my-default-printer.py	(.../branches/0.7.74.x)	(revision 1654)
+@@ -26,7 +26,7 @@
+ import signal
+ import sys
+ 
+-domain='my-default-printer'
++domain='system-config-printer'
+ import locale
+ locale.setlocale (locale.LC_ALL, "")
+ from gettext import gettext as _
+Index: ChangeLog
+===================================================================
+--- ChangeLog	(.../tags/0.7.74.4)	(revision 1654)
++++ ChangeLog	(.../branches/0.7.74.x)	(revision 1654)
+@@ -1,5 +1,15 @@
++2007-10-03  Till Kamppeter  <till.kamppeter at gmail.com>
++
++	* my-default-printer.py: Corrected gettext domain (Ubuntu #147788).
++
+ 2007-10-02  Tim Waugh  <twaugh at redhat.com>
+ 
++	* system-config-printer.py (GUI.save_printer): Fetch server settings
++	if printer was saved.  This allows us to update the 'not published'
++	label earlier.
++
++2007-10-02  Tim Waugh  <twaugh at redhat.com>
++
+ 	* configure.in: Version 0.7.74.4.
+ 
+ 2007-10-02  Tim Waugh  <twaugh at redhat.com>
+Index: system-config-printer.py
+===================================================================
+--- system-config-printer.py	(.../tags/0.7.74.4)	(revision 1654)
++++ system-config-printer.py	(.../branches/0.7.74.x)	(revision 1654)
+@@ -1392,6 +1392,16 @@
+             return True
+         self.changed = set() # of options
+ 
++        if not self.__dict__.has_key ("server_settings"):
++            # We can authenticate with the server correctly at this point,
++            # but we have never fetched the server settings to see whether
++            # the server is publishing shared printers.  Fetch the settings
++            # now so that we can update the "not published" label if necessary.
++            try:
++                self.server_settings = self.cups.adminGetServerSettings()
++            except:
++                nonfatalException()
++
+         if class_deleted:
+             self.populateList ()
+         else:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-8/system-config-printer.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- system-config-printer.spec	4 Oct 2007 11:29:19 -0000	1.138
+++ system-config-printer.spec	4 Oct 2007 11:37:02 -0000	1.139
@@ -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 -p0 -b .0.7.74.x
 
 %build
 %configure
@@ -126,6 +128,7 @@
 
 %changelog
 * Wed Oct  3 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.4-2
+- Include two more fixes from stable branch.
 - No need to run update-desktop-database because there are no MimeKey
   lines in the desktop files.
 - Consistent macro style.