rpms/system-config-printer/F-9 system-config-printer-1.0.x.patch, 1.5, 1.6 system-config-printer.spec, 1.203, 1.204

Fri Dec 5 16:26:58 UTC 2008

Author: twaugh

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

Modified Files:
	system-config-printer-1.0.x.patch system-config-printer.spec 
Log Message:
* Fri Dec  5 2008 Tim Waugh <twaugh at redhat.com> 1.0.12-2
- Added patch for 1.0.x changes since 1.0.12:
  - Smarter PPD cache in cupshelpers module.
  - Don't write back localized versions of globalized PPDs.


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

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.5 -r 1.6 system-config-printer-1.0.x.patch
Index: system-config-printer-1.0.x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/system-config-printer-1.0.x.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6

--- system-config-printer-1.0.x.patch	4 Nov 2008 17:39:14 -0000	1.5
+++ system-config-printer-1.0.x.patch	5 Dec 2008 16:26:27 -0000	1.6
@@ -1,804 +1,204 @@
-diff -U0 system-config-printer-1.0.9/ChangeLog.1.0.x system-config-printer-1.0.9/ChangeLog
---- system-config-printer-1.0.9/ChangeLog.1.0.x	2008-10-21 17:26:45.000000000 +0100
-+++ system-config-printer-1.0.9/ChangeLog	2008-11-04 17:35:18.000000000 +0000
-@@ -0,0 +1,165 @@
-+2008-11-04  Tim Waugh  <twaugh at redhat.com>
-+
-+	* system-config-printer.py (GUI.__init__): Don't set the
-+	IconView's item_width as that causes problem.  Set the column and
-+	row spacing instead.
-+
-+2008-11-04  Tim Waugh  <twaugh at redhat.com>
-+
-+	* monitor.py (Monitor.fetch_jobs): Apply specific_dests filter to
-+	fetched jobs.
-+
-+2008-11-04  Tim Waugh  <twaugh at redhat.com>
-+
-+	* monitor.py (Monitor.update_connecting_devices): Only call
-+	still_connecting once, not repeatedly.
-+
-+2008-11-04  Tim Waugh  <twaugh at redhat.com>
-+
-+	* monitor.py (Monitor.get_notifications): Prevent timer callbacks
-+	while we handle client callbacks.
-+	(Monitor.refresh): Likewise.
-+
-+2008-11-04  Tim Waugh  <twaugh at redhat.com>
-+
-+	* monitor.py (Monitor.refresh): Reverted recent change inverting
-+	order of calls.  The current_printers_and_jobs callback must be
-+	called first.
-+	(Monitor.set_process_pending): Control whether pending events may
-+	be processed.
-+	(Monitor.__init__): Initially they can.
-+	(Monitor.check_still_connecting): Defer timer callback if pending
-+	events are held.
-+	(Monitor.get_notifications): Likewise.
-+	(Monitor.fetch_jobs): Skip callback if events are held.
-+
-+2008-11-03  Tim Waugh  <twaugh at redhat.com>
-+
-+	* jobviewer.py (JobViewer.current_printers_and_jobs): Don't
-+	process pending events while processing new jobs list.
-+
-+2008-11-03  Tim Waugh  <twaugh at redhat.com>
-+
-+	* jobviewer.py (JobViewer.set_process_pending): Control whether
-+	pending events may be processed.
-+	(JobViewer.__init__): Initially they can.
-+	(JobViewer.set_statusicon_visibility): Only process pending events
-+	if allowed to.
-+
-+2008-11-03  Tim Waugh  <twaugh at redhat.com>
-+
-+	* jobviewer.py (JobViewer.update_job): Make sure the notification
-+	is still valid after letting the status icon show itself.
-+	(JobViewer.on_auth_notification_closed): Mark notification as
-+	closed.
-+	(JobViewer.job_removed): Likewise.
-+
-+2008-11-03  Tim Waugh  <twaugh at redhat.com>
-+
-+	* jobviewer.py (JobViewer.update_job): Restored compatibility code
-+	for pycups < 1.9.40 when connecting to CUPS and requesting
-+	specific job attributes.
-+
-+2008-11-03  Tim Waugh  <twaugh at redhat.com>
-+
-+	* jobviewer.py (JobViewer.cleanup): Close open notifications on
-+	exit (trac #106).
-+
-+2008-11-03  Tim Waugh  <twaugh at redhat.com>
-+
-+	* monitor.py (Monitor.refresh): Fixed race condition causing stale
-+	jobs (trac #107).
-+
-+2008-11-03  Tim Waugh  <twaugh at redhat.com>
-+
-+	* jobviewer.py (JobViewer.update_job): Already set status icon
-+	visibility here.
-+
-+2008-11-02  Tim Waugh  <twaugh at redhat.com>
-+
-+	* monitor.py (Monitor.fetch_jobs): Better logic for job trimming.
-+
-+2008-10-31  Tim Waugh  <twaugh at redhat.com>
-+
-+	* jobviewer.py (JobViewer.current_printers_and_jobs): Better
-+	debugging.
-+	(JobViewer.job_event): Likewise.
-+
-+2008-10-31  Tim Waugh  <twaugh at redhat.com>
-+
-+	* jobviewer.py (JobViewer.job_event): Remove job-hold-until from
-+	provided job data unless it was also provided as part of the
-+	notification.  Call update_job earlier to make sure all required
-+	attributes are present.
-+
-+2008-10-31  Tim Waugh  <twaugh at redhat.com>
-+
-+	* jobviewer.py (JobViewer.add_job): Use iter while it's fresh.
-+
-+2008-10-31  Tim Waugh  <twaugh at redhat.com>
-+
-+	* jobviewer.py (JobViewer.update_job): Delete auth notification
-+	after closing it, otherwise we'll never show the notification for
-+	this job again.
-+
-+2008-10-31  Tim Waugh  <twaugh at redhat.com>
-+
-+	* jobviewer.py (JobViewer.set_statusicon_visibility): Let the icon
-+	show/hide itself before continuing.
-+	(JobViewer.notify_new_printer): No longer need to do that here.
-+	(JobViewer.notify_printer_state_reason): Likewise.
-+
-+2008-10-31  Tim Waugh  <twaugh at redhat.com>
-+
-+	* jobviewer.py (JobViewer.update_job): Set status icon visibility
-+	before making auth notification visible.
-+
-+2008-10-31  Tim Waugh  <twaugh at redhat.com>
-+
-+	* jobviewer.py (JobViewer.add_job): Moved fetch of required job
-+	attributes...
-+	(JobViewer.update_job): ...here so that job event handling has
-+	access to all the attributes it requires.
-+
-+2008-10-31  Tim Waugh  <twaugh at redhat.com>
-+
-+	* jobviewer.py (JobViewer.set_statusicon_visibility): Count auth
-+	notifications as reasons to keep the status icon visible.
-+
-+2008-10-31  Tim Waugh  <twaugh at redhat.com>
-+
-+	* jobviewer.py (JobViewer.job_removed): Close outstanding auth
-+	notifications when the job is removed.
-+
-+2008-10-31  Tim Waugh  <twaugh at redhat.com>
-+
-+	* monitor.py (Monitor.fetch_jobs): Trim the remaining jobs after
-+	the last job is returned.
-+
-+2008-10-28  Tim Waugh  <twaugh at redhat.com>
-+
-+	* jobviewer.py (JobViewer.current_printers_and_jobs): Moved fetch
-+	of required job attributes...
-+	* jobviewer.py (JobViewer.add_job): ...here.  This is needed
-+	because all jobs are added via add_job now, even pre-existing
-+	ones.
-+
-+2008-10-29  Tim Waugh  <twaugh at redhat.com>
-+
-+	* jobviewer.py (JobViewer.on_state_reason_notification_closed):
-+	Set 'closed' data for notification instead of removing the object
-+	from the state_reason_notifications dict.
-+	(JobViewer.set_statusicon_visibility): Skip closed notifications
-+	when counting how many open notifications there are.
-+	(JobViewer.notify_printer_state_reason): No need to set
-+	'printer-state-reason' data on object any more.
-+	(JobViewer.state_reason_removed): Don't try closing notification
-+	if it was already closed.  Remove the notification from the
-+	state_reasons_notification dict now that the reason is cleared.
-+	Adjust statusicon visibility appropriately.
-+
-+2008-10-29  Tim Waugh  <twaugh at redhat.com>
-+
-+	* my-default-printer.py (Dialog.__init__): Set default window icon
-+	(Ubuntu #290469).
-+
-diff -up system-config-printer-1.0.9/cupshelpers/ppds.py.1.0.x system-config-printer-1.0.9/cupshelpers/ppds.py
---- system-config-printer-1.0.9/cupshelpers/ppds.py.1.0.x	2008-10-21 17:21:24.000000000 +0100
-+++ system-config-printer-1.0.9/cupshelpers/ppds.py	2008-11-04 17:35:18.000000000 +0000
-@@ -327,7 +327,7 @@ class PPDs:
-         particular printer model, given its make and model name.
- 
- 	@returns: a dict, indexed by ppd-name, of dicts representing
--        PPDs (as given by cups.Connection.getPPDs)"
-+        PPDs (as given by cups.Connection.getPPDs)
- 	"""
-         self._init_makes ()
-         try:
-diff -up system-config-printer-1.0.9/jobviewer.py.1.0.x system-config-printer-1.0.9/jobviewer.py
---- system-config-printer-1.0.9/jobviewer.py.1.0.x	2008-10-21 10:02:45.000000000 +0100
-+++ system-config-printer-1.0.9/jobviewer.py	2008-11-04 17:35:18.000000000 +0000
-@@ -296,6 +296,7 @@ class JobViewer (monitor.Watcher):
-         if bus == None:
-             bus = dbus.SystemBus ()
- 
-+        self.set_process_pending (True)
-         self.host = cups.getServer ()
-         self.port = cups.getPort ()
[...6400 lines suppressed...]
-+
-+#~ msgid "Delete this printer queue"
-+#~ msgstr "IzbriÅ¡ite ovaj red za Å¡tampanje"
+ #, fuzzy
++#~ msgid "Printer IP:"
++#~ msgstr "Skrivare"
 +
- #~ msgid "Password required"
- #~ msgstr "Lozinka je neophodna"
-diff -up system-config-printer-1.0.9/po/sr.po.1.0.x system-config-printer-1.0.9/po/sr.po
---- system-config-printer-1.0.9/po/sr.po.1.0.x	2008-10-21 10:02:52.000000000 +0100
-+++ system-config-printer-1.0.9/po/sr.po	2008-11-04 17:35:18.000000000 +0000
-@@ -11,7 +11,7 @@ msgstr ""
- "Project-Id-Version: system-config-printer.0.7.82.x.sr\n"
- "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
- "POT-Creation-Date: 2008-09-29 17:46+0100\n"
--"PO-Revision-Date: 2008-10-21 00:46-0400\n"
-+"PO-Revision-Date: 2008-10-21 21:08-0400\n"
- "Last-Translator:  <>\n"
- "Language-Team: Serbian <fedora-trans-sr at redhat.com>\n"
- "MIME-Version: 1.0\n"
-@@ -278,7 +278,7 @@ msgstr "ÐŸÐ¾ÑÐ°Ð¾ Ð·Ð°Ñ…Ñ‚ÐµÐ²Ð° aÑƒÑ‚Ð
- 
- #: ../jobviewer.py:537
- msgid "Authenticate"
--msgstr "ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÑƒÑ˜"
-+msgstr "ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ð¸"
- 
- #: ../jobviewer.py:621
- #, python-format
-@@ -344,7 +344,7 @@ msgstr "ÐŸÐ¾_ÑÑ‚Ð°Ð²Ð¸ ÐºÐ°Ð¾ Ð¿Ð¾Ð´Ñ€Ð
- #: ../troubleshoot/ChooseNetworkPrinter.py:36
- #: ../troubleshoot/ChoosePrinter.py:37
- msgid "Location"
--msgstr "Ð›Ð¾ÐºÐ°Ñ†Ð¸Ñ˜Ð°"
-+msgstr "ÐœÐµÑÑ‚Ð¾"
- 
- #: ../optionwidgets.py:117
- msgid "Conflicts with:"
-@@ -891,7 +891,7 @@ msgstr "72 Ñ‚Ð°Ñ‡ÐºÐµ Ð¿Ð¾ Ð¸Ð½Ñ‡Ñƒ"
- 
- #: ../system-config-printer.glade.h:9
- msgid "<b>Authentication</b>"
--msgstr "<b>ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð°</b>"
-+msgstr "<b>ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ð°</b>"
- 
- #: ../system-config-printer.glade.h:10
- msgid "<b>Banner</b>"
-@@ -1145,7 +1145,7 @@ msgstr "ÐÑƒÑ‚Ð¾Ñ€ÑÐºÐ° Ð¿Ñ€Ð°Ð²Ð° Â© 2
- msgid ""
- "Create a class from the selected printers (for failover or load-balancing)"
- msgstr ""
--"ÐšÑ€ÐµÐ¸Ñ€Ð°Ñ˜ ÐºÐ»Ð°ÑÑƒ Ð¾Ð´ Ð¾Ð´Ð°Ð±Ñ€Ð°Ð½Ð¸Ñ… ÑˆÑ‚Ð°Ð¼Ð¿Ð°Ñ‡Ð° (Ð·Ð° ÑÐ»ÑƒÑ‡Ð°Ñ˜ Ð¾Ð¿Ð¾Ñ€Ð°Ð²ÐºÐ° Ð¸Ð»Ð¸ Ð±Ð°Ð»Ð°Ð½ÑÐ¸Ñ€Ð°ÑšÐ° "
-+"ÐÐ°Ð¿Ñ€Ð°Ð²Ð¸ ÐºÐ»Ð°ÑÑƒ Ð¾Ð´ Ð¾Ð´Ð°Ð±Ñ€Ð°Ð½Ð¸Ñ… ÑˆÑ‚Ð°Ð¼Ð¿Ð°Ñ‡Ð° (Ð·Ð° ÑÐ»ÑƒÑ‡Ð°Ñ˜ Ð¾Ð¿Ð¾Ñ€Ð°Ð²ÐºÐ° Ð¸Ð»Ð¸ Ð±Ð°Ð»Ð°Ð½ÑÐ¸Ñ€Ð°ÑšÐ° "
- "Ð¾Ð¿Ñ‚ÐµÑ€ÐµÑ›ÐµÑšÐ°)"
- 
- #: ../system-config-printer.glade.h:75
-@@ -1295,11 +1295,12 @@ msgstr "ÐŸÐ¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ Ð½Ð¸Ñ˜Ð°Ð½Ñ
- 
- #: ../system-config-printer.glade.h:118
- msgid "Human-readable description such as \"HP LaserJet with Duplexer\""
--msgstr "ÐžÐ¿Ð¸Ñ ÐºÐ¾Ñ˜Ð¸ Ñ˜Ðµ Ñ™ÑƒÐ´Ð¸Ð¼Ð° Ñ€Ð°Ð·ÑƒÐ¼Ñ™Ð¸Ð² ÐºÐ°Ð¾ â€žHP LaserJet ÑÐ° Ð¾Ð±Ð¾ÑÑ‚Ñ€Ð°Ð½Ð¸Ð¼ ÑˆÑ‚Ð°Ð¼Ð¿Ð°ÑšÐµÐ¼â€œ"
-+msgstr ""
-+"ÐžÐ¿Ð¸Ñ ÐºÐ¾Ñ˜Ð¸ Ñ˜Ðµ Ñ™ÑƒÐ´Ð¸Ð¼Ð° Ñ€Ð°Ð·ÑƒÐ¼Ñ™Ð¸Ð² Ð¿Ð¾Ð¿ÑƒÑ‚ â€žHP LaserJet ÑÐ° Ð¾Ð±Ð¾ÑÑ‚Ñ€Ð°Ð½Ð¸Ð¼ ÑˆÑ‚Ð°Ð¼Ð¿Ð°ÑšÐµÐ¼â€œ"
++#, fuzzy
+ #~ msgid "Select a print driver for your printer."
+ #~ msgstr "VÃ¤lj skrivare frÃ¥n databasen"
  
- #: ../system-config-printer.glade.h:119
- msgid "Human-readable location such as \"Lab 1\""
--msgstr "Ð›Ð¾ÐºÐ°Ñ†Ð¸Ñ˜Ð° ÐºÐ¾Ñ˜Ð° Ñ˜Ðµ Ñ™ÑƒÐ´Ð¸Ð¼Ð° Ñ€Ð°Ð·ÑƒÐ¼Ñ™Ð¸Ð²Ð° ÐºÐ°Ð¾ â€žÐšÐ°Ð½Ñ†ÐµÐ»Ð°Ñ€Ð¸Ñ˜Ð° 1â€œ"
-+msgstr "Ð›Ð¾ÐºÐ°Ñ†Ð¸Ñ˜Ð° ÐºÐ¾Ñ˜Ð° Ñ˜Ðµ Ñ™ÑƒÐ´Ð¸Ð¼Ð° Ñ€Ð°Ð·ÑƒÐ¼Ñ™Ð¸Ð²Ð° Ð¿Ð¾Ð¿ÑƒÑ‚ â€žÐ›Ð°Ð±Ð¾Ñ€Ð°Ñ‚Ð¾Ñ€Ð¸Ñ˜Ð° 1â€œ"
- 
- #: ../system-config-printer.glade.h:120
- msgid "IPP"
-@@ -1553,7 +1554,7 @@ msgstr "Ð˜ÑÐ¿Ð¸Ñ‚Ð°Ñ˜"
- 
- #: ../system-config-printer.glade.h:203
- msgid "Prompt user if authentication is required"
--msgstr "ÐŸÐ¾ÑˆÐ°Ñ™Ð¸ ÑƒÐ¿Ð¸Ñ‚ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÑƒ Ð°ÐºÐ¾ Ñ˜Ðµ aÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð° Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð½Ð°"
-+msgstr "ÐŸÐ¾ÑˆÐ°Ñ™Ð¸ ÑƒÐ¿Ð¸Ñ‚ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÑƒ Ð°ÐºÐ¾ Ñ˜Ðµ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð½Ð° Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ð°"
- 
- #: ../system-config-printer.glade.h:204
- msgid "Provide PPD file"
-diff -up system-config-printer-1.0.9/system-config-printer.py.1.0.x system-config-printer-1.0.9/system-config-printer.py
---- system-config-printer-1.0.9/system-config-printer.py.1.0.x	2008-10-21 10:02:45.000000000 +0100
-+++ system-config-printer-1.0.9/system-config-printer.py	2008-11-04 17:35:19.000000000 +0000
-@@ -374,7 +374,8 @@ class GUI(GtkGUI, monitor.Watcher):
-                                       gobject.TYPE_STRING)   # Tooltip
-         
-         self.dests_iconview.set_model(self.mainlist)
--        self.dests_iconview.set_item_width (145)
-+        self.dests_iconview.set_column_spacing (30)
-+        self.dests_iconview.set_row_spacing (20)
-         self.dests_iconview.set_pixbuf_column (1)
-         self.dests_iconview.set_text_column (2)
-         self.dests_iconview.set_tooltip_column (3)
-@@ -3410,9 +3411,12 @@ class NewPrinterGUI(GtkGUI):
-         if step > 0 and next_page_nr == 0: # About to choose a name.
-             # Suggest an appropriate name.
-             name = None
-+            descr = None
+@@ -4749,3 +4155,4 @@ msgstr "VÃ¤lj standardskrivare"
+ #, fuzzy
+ #~ msgid "Unknown printer"
+ #~ msgstr "OkÃ¤nd"
 +
-             try:
--                if self.device.id:
-+                if self.device.id and not self.device.type in ("socket", "lpd", "ipp", "bluetooth"):
-                     name = self.device.id_dict["MDL"]
-+                    descr = "%s %s" % (self.device.id_dict["MFG"], self.device.id_dict["MDL"])
-             except:
-                 nonfatalException ()
- 
-@@ -3421,6 +3425,7 @@ class NewPrinterGUI(GtkGUI):
-                     mname = self.ppd.findAttr ("modelName").value
-                     make, model = cupshelpers.ppds.ppdMakeModelSplit (mname)
-                     name = "%s %s" % (make, model)
-+                    descr = "%s %s" % (make, model)
-             except:
-                 nonfatalException ()
- 
-@@ -3430,6 +3435,9 @@ class NewPrinterGUI(GtkGUI):
-             name = self.mainapp.makeNameUnique (name)
-             self.entNPName.set_text (name)
+diff -up system-config-printer-1.0.12/system-config-printer.py.1.0.x system-config-printer-1.0.12/system-config-printer.py
+--- system-config-printer-1.0.12/system-config-printer.py.1.0.x	2008-11-30 22:47:27.000000000 +0000
++++ system-config-printer-1.0.12/system-config-printer.py	2008-12-05 16:05:29.000000000 +0000
+@@ -1750,6 +1750,8 @@ class GUI(GtkGUI, monitor.Watcher):
  
-+            if self.entNPDescription.get_text () == '' and descr:
-+                self.entNPDescription.set_text (descr)
-+
-         self.ntbkNewPrinter.set_current_page(next_page_nr)
+         try:
+             self.ppd = printer.getPPD()
++            self.ppd_local = printer.getPPD()
++            self.ppd_local.localize()
+         except cups.IPPError, (e, m):
+             # Some IPP error other than IPP_NOT_FOUND.
+             show_IPP_Error(e, m, self.MainWindow)
+@@ -1988,19 +1990,20 @@ class GUI(GtkGUI, monitor.Watcher):
+             return
+         ppd = self.ppd
+         ppd.markDefaults()
++        self.ppd_local.markDefaults()
  
-         self.setNPButtons()
+         hasInstallableOptions = False
+         
+         # build option tabs
+-        for group in ppd.optionGroups:
++        for group in self.ppd_local.optionGroups:
+             if group.name == "InstallableOptions":
+                 hasInstallableOptions = True
+                 container = self.vbPInstallOptions
+                 tab_nr = self.ntbkPrinter.page_num(self.swPInstallOptions)
+                 if tab_nr == -1:
+-                    self.ntbkPrinter.insert_page(
+-                        self.swPInstallOptions, gtk.Label(group.text),
+-                        self.static_tabs)
++                    self.ntbkPrinter.insert_page(self.swPInstallOptions,
++                                                 gtk.Label(group.text),
++                                                 self.static_tabs)
+                 tab_label = self.lblPInstallOptions
+             else:
+                 frame = gtk.Frame("<b>%s</b>" % group.text)
+@@ -5110,7 +5113,6 @@ class NewPrinterGUI(GtkGUI):
+                 ppd = self.NPDrivers[nr]
+             elif self.rbtnNPPPD.get_active():
+                 ppd = cups.PPD(self.filechooserPPD.get_filename())
+-                ppd.localize ()
+             else:
+                 # PPD of the driver downloaded from OpenPrinting XXX
+                 treeview = self.tvNPDownloadableDrivers
+@@ -5132,7 +5134,6 @@ class NewPrinterGUI(GtkGUI):
+                             ppdfile.write(ppdcontent)
+                             ppdfile.close()
+                             ppd = cups.PPD(ppdname)
+-                            ppd.localize ()
+                             os.unlink(ppdname)
+ 
+         except RuntimeError, e:
+@@ -5188,7 +5189,6 @@ class NewPrinterGUI(GtkGUI):
+                 if (ppd != "raw"):
+                     f = self.mainapp.cups.getServerPPD(ppd)
+                     ppd = cups.PPD(f)
+-                    ppd.localize ()
+                     os.unlink(f)
+             except AttributeError:
+                 nonfatalException()
+@@ -5373,7 +5373,6 @@ class NewPrinterGUI(GtkGUI):
+                 try:
+                     filename = self.mainapp.cups.getPPD(name)
+                     ppd = cups.PPD(filename)
+-                    ppd.localize ()
+                     os.unlink(filename)
+                 except cups.IPPError, (e, msg):
+                     if e == cups.IPP_NOT_FOUND:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/system-config-printer.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- system-config-printer.spec	1 Dec 2008 14:27:13 -0000	1.203
+++ system-config-printer.spec	5 Dec 2008 16:26:28 -0000	1.204
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,6 +15,8 @@
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
+Patch0: system-config-printer-1.0.x.patch
+
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -60,6 +62,7 @@
 
 %prep
 %setup -q -a 1 -a 2
+%patch0 -p1 -b .1.0.x
 
 %build
 %configure
@@ -149,6 +152,11 @@
 exit 0
 
 %changelog
+* Fri Dec  5 2008 Tim Waugh <twaugh at redhat.com> 1.0.12-2
+- Added patch for 1.0.x changes since 1.0.12:
+  - Smarter PPD cache in cupshelpers module.
+  - Don't write back localized versions of globalized PPDs.
+
 * Fri Nov 28 2008 Tim Waugh <twaugh at redhat.com> 1.0.12-1
 - Updated to 1.0.12:
   - Don't automatically replace network printer URIs with


