From 1176d1711554da19874ee1276c935e4fb097909c Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Jan 17 2011 16:37:19 +0000
Subject: 1.2.6:


---

diff --git a/.gitignore b/.gitignore
index 3d87163..cc5510a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -226,3 +226,4 @@ pycups-1.9.51.tar.bz2
 /system-config-printer-1.2.4.tar.xz
 /system-config-printer-1.2.5.tar.xz
 /pycups-1.9.53.tar.bz2
+/system-config-printer-1.2.6.tar.xz
diff --git a/sources b/sources
index 3880460..55f801a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 32b995dbf8419128f652279881b9023d  pysmbc-1.0.9.tar.bz2
-600a231216fb7bde061ef753db9a7e54  system-config-printer-1.2.5.tar.xz
 5fe5b696e19ab5aa3c463b1c030e2c50  pycups-1.9.53.tar.bz2
+058c77d6989a1ddd1ee49bb6155f08b8  system-config-printer-1.2.6.tar.xz
diff --git a/system-config-printer-1.2.5.tar.xz.sig b/system-config-printer-1.2.5.tar.xz.sig
deleted file mode 100644
index e55367a..0000000
Binary files a/system-config-printer-1.2.5.tar.xz.sig and /dev/null differ
diff --git a/system-config-printer-1.2.6.tar.xz.sig b/system-config-printer-1.2.6.tar.xz.sig
new file mode 100644
index 0000000..4059576
Binary files /dev/null and b/system-config-printer-1.2.6.tar.xz.sig differ
diff --git a/system-config-printer-InstallPrinterDrivers-debug.patch b/system-config-printer-InstallPrinterDrivers-debug.patch
deleted file mode 100644
index d1df4ac..0000000
--- a/system-config-printer-InstallPrinterDrivers-debug.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -up system-config-printer-1.2.5/installdriver.py.InstallPrinterDrivers-debug system-config-printer-1.2.5/installdriver.py
---- system-config-printer-1.2.5/installdriver.py.InstallPrinterDrivers-debug	2010-10-12 17:03:22.000000000 +0100
-+++ system-config-printer-1.2.5/installdriver.py	2010-10-14 14:09:49.205869035 +0100
-@@ -22,6 +22,7 @@
- import dbus
- import dbus.glib
- import dbus.service
-+from debug import debugprint
- 
- class PrinterDriversInstaller(dbus.service.Object):
-     DBUS_PATH  = "/com/redhat/PrinterDriversInstaller"
-@@ -43,8 +44,12 @@ class PrinterDriversInstaller(dbus.servi
-         obj = bus.get_object ("org.freedesktop.PackageKit",
-                               "/org/freedesktop/PackageKit")
-         proxy = dbus.Interface (obj, "org.freedesktop.PackageKit.Modify")
--        proxy.InstallPrinterDrivers (0, ["MFG:%s;MDL:%s;" % (mfg, mdl)],
--                                     "hide-finished",
-+        xid = 0
-+        resources = ["MFG:%s;MDL:%s;" % (mfg, mdl)]
-+        interaction = "hide-finished"
-+        debugprint ("Calling InstallPrinterDrivers (%s, %s, %s)" %
-+                    (repr (xid), repr (resources), repr (interaction)))
-+        proxy.InstallPrinterDrivers (xid, resources, interaction,
-                                      reply_handler=reply_handler,
-                                      error_handler=error_handler,
-                                      timeout=3600)
-diff -up system-config-printer-1.2.5/ppdsloader.py.InstallPrinterDrivers-debug system-config-printer-1.2.5/ppdsloader.py
---- system-config-printer-1.2.5/ppdsloader.py.InstallPrinterDrivers-debug	2010-10-13 13:11:16.000000000 +0100
-+++ system-config-printer-1.2.5/ppdsloader.py	2010-10-14 14:09:49.207994422 +0100
-@@ -163,8 +163,11 @@ class PPDsLoader:
-             obj = self._bus.get_object ("org.freedesktop.PackageKit",
-                                         "/org/freedesktop/PackageKit")
-             proxy = dbus.Interface (obj, "org.freedesktop.PackageKit.Modify")
--            proxy.InstallPrinterDrivers (xid, [self._device_id],
--                                         "hide-finished",
-+            resources = [self._device_id]
-+            interaction = "hide-finished"
-+            debugprint ("Calling InstallPrinterDrivers (%s, %s, %s)" %
-+                        (repr (xid), repr (resources), repr (interaction)))
-+            proxy.InstallPrinterDrivers (xid, resources, interaction,
-                                          reply_handler=self._packagekit_reply,
-                                          error_handler=self._packagekit_error,
-                                          timeout=3600)
diff --git a/system-config-printer-NPTLpdQueue.patch b/system-config-printer-NPTLpdQueue.patch
deleted file mode 100644
index 4302015..0000000
--- a/system-config-printer-NPTLpdQueue.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up system-config-printer-1.2.5/system-config-printer.py.NPTLpdQueue system-config-printer-1.2.5/system-config-printer.py
---- system-config-printer-1.2.5/system-config-printer.py.NPTLpdQueue	2010-10-22 11:18:13.000000000 +0200
-+++ system-config-printer-1.2.5/system-config-printer.py	2010-10-22 11:18:13.000000000 +0200
-@@ -6083,6 +6083,9 @@ class NewPrinterGUI(GtkGUI):
-         self.btnNPTLpdProbe.set_sensitive (len (hostname) > 0)
-         self.setNPButtons()
- 
-+    def on_cmbentNPTLpdQueue_changed(self, cmbent):
-+        self.setNPButtons()
-+
-     def on_btnNPTLpdProbe_clicked(self, button):
-         # read hostname, probe, fill printer names
-         hostname = self.cmbentNPTLpdHost.get_active_text()
-diff -up system-config-printer-1.2.5/ui/NewPrinterWindow.glade.NPTLpdQueue system-config-printer-1.2.5/ui/NewPrinterWindow.glade
---- system-config-printer-1.2.5/ui/NewPrinterWindow.glade.NPTLpdQueue	2010-10-12 18:03:22.000000000 +0200
-+++ system-config-printer-1.2.5/ui/NewPrinterWindow.glade	2010-10-22 11:19:51.000000000 +0200
-@@ -752,7 +752,7 @@ ipp://printer.mydomain/ipp</property>
-                                             <accessibility>
-                                               <relation type="labelled-by" target="label201"/>
-                                             </accessibility>
--                                            <signal name="changed" handler="on_entNPTDevice_changed"/>
-+                                            <signal name="changed" handler="on_cmbentNPTLpdQueue_changed"/>
-                                           </object>
-                                           <packing>
-                                             <property name="left_attach">1</property>
diff --git a/system-config-printer-compiz-rename.patch b/system-config-printer-compiz-rename.patch
deleted file mode 100644
index 97d95b9..0000000
--- a/system-config-printer-compiz-rename.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up system-config-printer-1.2.5/system-config-printer.py.compiz-rename system-config-printer-1.2.5/system-config-printer.py
---- system-config-printer-1.2.5/system-config-printer.py.compiz-rename	2010-12-02 16:15:00.656238304 +0000
-+++ system-config-printer-1.2.5/system-config-printer.py	2010-12-02 16:15:13.265702866 +0000
-@@ -3076,6 +3076,7 @@ class GUI(GtkGUI, monitor.Watcher):
-         ids.append (cell.connect ('editing-canceled',
-                                  self.printer_name_edit_cancel))
-         self.rename_sigids = ids
-+        self.dests_iconview.grab_focus ()
- 
-     def printer_name_edited (self, cell, path, newname):
-         newname = newname.replace("/", "")
diff --git a/system-config-printer-mfg-mdl.patch b/system-config-printer-mfg-mdl.patch
deleted file mode 100644
index 301e1a1..0000000
--- a/system-config-printer-mfg-mdl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up system-config-printer-1.2.5/ppdsloader.py.mfg-mdl system-config-printer-1.2.5/ppdsloader.py
---- system-config-printer-1.2.5/ppdsloader.py.mfg-mdl	2010-10-14 14:09:49.207994422 +0100
-+++ system-config-printer-1.2.5/ppdsloader.py	2010-10-14 16:21:15.821926650 +0100
-@@ -133,6 +133,8 @@ class PPDsLoader:
-             if (status != ppds.STATUS_SUCCESS and
-                 self._packagekit_queried == False and
-                 self._local_cups == True):
-+                self._gpk_device_id = "MFG:%s;MDL:%s;" % (devid_dict["MFG"],
-+                                                          devid_dict["MDL"])
-                 self._query_packagekit ()
-                 self._packagekit_queried = True
-                 return
-@@ -163,7 +165,7 @@ class PPDsLoader:
-             obj = self._bus.get_object ("org.freedesktop.PackageKit",
-                                         "/org/freedesktop/PackageKit")
-             proxy = dbus.Interface (obj, "org.freedesktop.PackageKit.Modify")
--            resources = [self._device_id]
-+            resources = [self._gpk_device_id]
-             interaction = "hide-finished"
-             debugprint ("Calling InstallPrinterDrivers (%s, %s, %s)" %
-                         (repr (xid), repr (resources), repr (interaction)))
diff --git a/system-config-printer-uint32.patch b/system-config-printer-uint32.patch
deleted file mode 100644
index b008907..0000000
--- a/system-config-printer-uint32.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up system-config-printer-1.2.5/installdriver.py.uint32 system-config-printer-1.2.5/installdriver.py
---- system-config-printer-1.2.5/installdriver.py.uint32	2010-10-29 14:42:04.310843583 +0100
-+++ system-config-printer-1.2.5/installdriver.py	2010-10-29 15:30:47.524996563 +0100
-@@ -49,7 +49,8 @@ class PrinterDriversInstaller(dbus.servi
-         interaction = "hide-finished"
-         debugprint ("Calling InstallPrinterDrivers (%s, %s, %s)" %
-                     (repr (xid), repr (resources), repr (interaction)))
--        proxy.InstallPrinterDrivers (xid, resources, interaction,
-+        proxy.InstallPrinterDrivers (dbus.UInt32 (xid),
-+                                     resources, interaction,
-                                      reply_handler=reply_handler,
-                                      error_handler=error_handler,
-                                      timeout=3600)
-diff -up system-config-printer-1.2.5/ppdsloader.py.uint32 system-config-printer-1.2.5/ppdsloader.py
---- system-config-printer-1.2.5/ppdsloader.py.uint32	2010-10-29 14:42:04.323844010 +0100
-+++ system-config-printer-1.2.5/ppdsloader.py	2010-10-29 15:30:47.525996440 +0100
-@@ -169,7 +169,8 @@ class PPDsLoader:
-             interaction = "hide-finished"
-             debugprint ("Calling InstallPrinterDrivers (%s, %s, %s)" %
-                         (repr (xid), repr (resources), repr (interaction)))
--            proxy.InstallPrinterDrivers (xid, resources, interaction,
-+            proxy.InstallPrinterDrivers (dbus.UInt32 (xid),
-+                                         resources, interaction,
-                                          reply_handler=self._packagekit_reply,
-                                          error_handler=self._packagekit_error,
-                                          timeout=3600)
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 1ffb662..28e6c82 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -6,8 +6,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.2.5
-Release: 8%{?dist}
+Version: 1.2.6
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -16,11 +16,6 @@ Source0: http://cyberelk.net/tim/data/system-config-printer/1.2/%{name}-%{versio
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 # Python bindings for libsmbclient
 Source2: http://pypi.python.org/packages/source/p/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
-Patch1: system-config-printer-InstallPrinterDrivers-debug.patch
-Patch2: system-config-printer-mfg-mdl.patch
-Patch3: system-config-printer-NPTLpdQueue.patch
-Patch4: system-config-printer-uint32.patch
-Patch5: system-config-printer-compiz-rename.patch
 Patch101: pysmbc-doczip.patch
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -80,22 +75,6 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 
-# Show debug output whenever InstallPrinterDrivers is called.
-%patch1 -p1 -b .InstallPrinterDrivers-debug
-
-# Always use MFG and MDL fields for InstallPrinterDrivers interface
-# (bug #643073).
-%patch2 -p1 -b .mfg-mdl
-
-# Don't check ComboBoxEntry for allowed characters (bug #644131).
-%patch3 -p1 -b .NPTLpdQueue
-
-# Make sure InstallPrinterDrivers gets correctly typed values (bug #647270).
-%patch4 -p1 -b .uint32
-
-# Grab focus on the IconView after setting it editable (bug #650995).
-%patch5 -p1 -b .compiz-rename
-
 pushd pysmbc-%{pysmbc_version}
 %patch101 -p1 -b .doczip
 popd
@@ -149,6 +128,7 @@ rm -rf %buildroot
 %dir %{python_sitelib}/cupshelpers
 %{python_sitelib}/cupshelpers/__init__.py*
 %{python_sitelib}/cupshelpers/cupshelpers.py*
+%{python_sitelib}/cupshelpers/installdriver.py*
 %{python_sitelib}/cupshelpers/openprinting.py*
 %{python_sitelib}/cupshelpers/ppds.py*
 %{python_sitelib}/*.egg-info
@@ -184,7 +164,6 @@ rm -rf %buildroot
 %{_datadir}/%{name}/gtkspinner.py*
 %{_datadir}/%{name}/gui.py*
 %{_datadir}/%{name}/HIG.py*
-%{_datadir}/%{name}/installdriver.py*
 %{_datadir}/%{name}/installpackage.py*
 %{_datadir}/%{name}/jobviewer.py*
 %{_datadir}/%{name}/monitor.py*
@@ -219,6 +198,14 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Jan 17 2011 Jiri Popelka <jpopelka@redhat.com> 1.2.6-1
+- 1.2.6:
+  - Remove reference to current printer on exit (bug #556548).
+  - Handle cups.Connection() failure in PrinterURIIndexr (bug #648014).
+  - Block unwanted characters when editing queue name (bug #658550).
+  - Initialise D-Bus threading in timedops module (bug #662047).
+  - many other fixes
+
 * Mon Dec 20 2010 Jiri Popelka <jpopelka@redhat.com> 1.2.5-8
 - Updated pycups to 1.9.53 (bug #662805).