From 65f976ba32389330abeaab5a12d53ef0a067d7d2 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Fri, 25 Jan 2008 18:19:14 +0000
Subject: [PATCH] - 0.7.79.

---
 .cvsignore                               |   1 +
 sources                                  |   2 +-
 system-config-printer-0.7.78.tar.bz2.sig | Bin 65 -> 0 bytes
 system-config-printer-0.7.79.tar.bz2.sig | Bin 0 -> 65 bytes
 system-config-printer-0.7.x.patch        |  63 -----------------------
 system-config-printer.spec               |  11 ++--
 6 files changed, 8 insertions(+), 69 deletions(-)
 delete mode 100644 system-config-printer-0.7.78.tar.bz2.sig
 create mode 100644 system-config-printer-0.7.79.tar.bz2.sig
 delete mode 100644 system-config-printer-0.7.x.patch

diff --git a/.cvsignore b/.cvsignore
index 0076017..91a5813 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -150,3 +150,4 @@ pycups-1.9.31.tar.bz2
 system-config-printer-0.7.78.tar.bz2
 pycups-1.9.32.tar.bz2
 pycups-1.9.33.tar.bz2
+system-config-printer-0.7.79.tar.bz2
diff --git a/sources b/sources
index 4c27eb5..e4072c1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-300a038e623c4192a68b4a43cf9b5dd8  system-config-printer-0.7.78.tar.bz2
 f976bcb6669118d0b87662901a91f996  pycups-1.9.33.tar.bz2
+b5693bf3d9ed271bde034cbe221bbab1  system-config-printer-0.7.79.tar.bz2
diff --git a/system-config-printer-0.7.78.tar.bz2.sig b/system-config-printer-0.7.78.tar.bz2.sig
deleted file mode 100644
index bf824cd1d36e254a5e22cb83e128e208095c8730..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 65
zcmV-H0KWf-KLZ5-M@64vX(f@P9=Dkz5dsYk0HA@8%X+ey9v<P|h>QG|S~fK$7+C<I
Xp8-4KiI3RV&Ex{!V-}XP0Br#TAxIhm

diff --git a/system-config-printer-0.7.79.tar.bz2.sig b/system-config-printer-0.7.79.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000..990649ac914569a287157e8b7e597f008f904401
GIT binary patch
literal 65
zcmV-H0KWf-KLZ5-N17zQX(f@P9=Dkz5dxf10HBJ~W0v$aHDi5j((DmxjX((t^U?sI
XfQ<HN?0m8KO-cAj7V)PO02RDcU9ucJ

literal 0
HcmV?d00001

diff --git a/system-config-printer-0.7.x.patch b/system-config-printer-0.7.x.patch
deleted file mode 100644
index 772b60d..0000000
--- a/system-config-printer-0.7.x.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -up system-config-printer-0.7.78/print-applet.desktop.in.0.7.x system-config-printer-0.7.78/print-applet.desktop.in
---- system-config-printer-0.7.78/print-applet.desktop.in.0.7.x	2007-11-22 15:23:59.000000000 +0000
-+++ system-config-printer-0.7.78/print-applet.desktop.in	2007-11-27 12:51:17.000000000 +0000
-@@ -5,6 +5,6 @@ _Comment=System tray icon for managing p
- Exec=/usr/bin/system-config-printer-applet
- Terminal=false
- Type=Application
--Icon=printer.png
-+Icon=printer
- X-KDE-autostart-after=panel
- StartupNotify=false
-diff -up system-config-printer-0.7.78/system-config-printer.py.0.7.x system-config-printer-0.7.78/system-config-printer.py
---- system-config-printer-0.7.78/system-config-printer.py.0.7.x	2007-11-22 15:23:59.000000000 +0000
-+++ system-config-printer-0.7.78/system-config-printer.py	2007-11-27 12:51:17.000000000 +0000
-@@ -3231,10 +3231,16 @@ class NewPrinterGUI(GtkGUI):
-             try:
-                 cups.setServer (match.group (2))
-                 c = cups.Connection ()
--                attributes = c.getPrinterAttributes (match.group (4))
-+                try:
-+                    attributes = c.getPrinterAttributes (uri = uri)
-+                except TypeError: # uri keyword introduced in pycups 1.9.32
-+                    print "Fetching printer attributes by name"
-+                    attributes = c.getPrinterAttributes (match.group (4))
-                 verified = True
-+            except cups.IPPError (e, msg):
-+                print "Failed to get attributes:", e, msg
-             except:
--                pass
-+                nonfatalError ()
-         else:
-             print uri
- 
-@@ -3279,9 +3285,8 @@ class NewPrinterGUI(GtkGUI):
-             printers = c.getPrinters ()
-             classes = c.getClasses ()
-             del c
--        except RuntimeError:
--            failed = True
--        except cups.IPP_Error, (e, msg):
-+        except:
-+            nonfatalException()
-             failed = True
- 
-         gtk.gdk.threads_enter()
-diff -U0 system-config-printer-0.7.78/ChangeLog.0.7.x system-config-printer-0.7.78/ChangeLog
---- system-config-printer-0.7.78/ChangeLog.0.7.x	2007-11-22 15:23:59.000000000 +0000
-+++ system-config-printer-0.7.78/ChangeLog	2007-11-27 12:51:17.000000000 +0000
-@@ -0,0 +1,14 @@
-+2007-11-27  Tim Waugh  <twaugh@redhat.com>
-+
-+	* system-config-printer.py
-+	(NewPrinterGUI.browse_ipp_queues_thread): Handle exceptions other
-+	than RuntimeError and cups.IPPError (bug #252304).
-+	(NewPrinterGUI.on_btnIPPVerify_clicked): Get printer attributes by
-+	printer URI not name, to prevent pycups constructing a CUPS URI
-+	(bug #252304).
-+
-+2007-11-22  Till Kamppeter  <till.kamppeter@gmail.com>
-+
-+	* print-applet.desktop.in: Removed the last printer.png (Ubuntu package
-+	did not build with Icon=printer.png in the .desktop file).
-+
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 2f5e3a3..db0e4b4 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -4,8 +4,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.78
-Release: 5%{?dist}
+Version: 0.7.79
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -13,7 +13,6 @@ Source0: system-config-printer-%{version}.tar.bz2
 Source1: pycups-%{pycups_version}.tar.bz2
 Source2: system-config-printer.pam
 Source3: system-config-printer.console
-Patch100: system-config-printer-0.7.x.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -59,8 +58,6 @@ the configuration tool.
 %prep
 %setup -q -a 1
 
-%patch100 -p1 -b .0.7.x
-
 %build
 %configure
 
@@ -109,6 +106,7 @@ rm -rf %buildroot
 %{_sbindir}/%{name}
 %{_datadir}/%{name}/config.py*
 %{_datadir}/%{name}/my-default-printer.py*
+%{_datadir}/%{name}/openprinting.py*
 %{_datadir}/%{name}/options.py*
 %{_datadir}/%{name}/optionwidgets.py*
 %{_datadir}/%{name}/probe_printer.py*
@@ -131,6 +129,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Jan 25 2008 Tim Waugh <twaugh@redhat.com> 0.7.79-1
+- 0.7.79.
+
 * Wed Jan 23 2008 Tim Waugh <twaugh@redhat.com> 0.7.78-5
 - Updated to pycups-1.9.33.