From 810c9a2df7b8cc0d90e9895c2bc708d032a342ed Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 2 Sep 2014 17:36:56 +0100
Subject: [PATCH] 1.5.1.

Some Python3 fixes (bug #1136470), udev-configure-printer fixes, and a
fix for a D-Bus service hang (bug #1116756).

Resolves: rhbz#1136470 rhbz#1116756
---
 .gitignore                             |   1 +
 sources                                |   2 +-
 system-config-printer-1.5.0.tar.xz.sig | Bin 280 -> 0 bytes
 system-config-printer-1.5.1.tar.xz.sig | Bin 0 -> 280 bytes
 system-config-printer-python3.patch    |   9 ---------
 system-config-printer.spec             |  13 +++++++------
 6 files changed, 9 insertions(+), 16 deletions(-)
 delete mode 100644 system-config-printer-1.5.0.tar.xz.sig
 create mode 100644 system-config-printer-1.5.1.tar.xz.sig
 delete mode 100644 system-config-printer-python3.patch

diff --git a/.gitignore b/.gitignore
index f0e8b2c..66d4afa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -249,3 +249,4 @@ pycups-1.9.51.tar.bz2
 /system-config-printer-1.4.4.tar.xz
 /system-config-printer-1.4.5.tar.xz
 /system-config-printer-1.5.0.tar.xz
+/system-config-printer-1.5.1.tar.xz
diff --git a/sources b/sources
index 99e452e..d9f97fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-264dd8edde7460cae411fe54bc22c9a6  system-config-printer-1.5.0.tar.xz
+64057f7064d2e7383ccce593aa7db8d3  system-config-printer-1.5.1.tar.xz
diff --git a/system-config-printer-1.5.0.tar.xz.sig b/system-config-printer-1.5.0.tar.xz.sig
deleted file mode 100644
index 8f4bdd12c76334215fda997ab00f04cf10b552e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 280
zcmV+z0q6dS0TlxU08_`Y-+5IMjiaHf(*Xk5kq7=Z-sQs3fgfgvZ_f$#Kr-eN1sTwA
zL3{oLuu(U2yvZ?8zmS%A(zGXUTG%s-{xOVSJ~j$Z%At2XM;*$TWg~QmF|KKY!oLSs
zC;TxRyOq=dNCbxH(<*8Nsu)Z{Jxr&5*-1wm4LTtARPu;g(cX0o&{p;9XUsj9<K44U
zNV{$h+Ci<?zpIA2pKj<QUocbv55y0^I8(f{1nBt$R2n;@7ue9jd5<O~A>TzNRDZo)
zq{lDIIE#62;)_?}&UnP2gfxVXcqx?9j!J(6{KLa(!f;*agsz!l?%;##L~K`jSmZV-
e*w2&t#ZI&MZ^U4k<U637Us?C#_Y4}SFTlfykBL|S

diff --git a/system-config-printer-1.5.1.tar.xz.sig b/system-config-printer-1.5.1.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..af29c33c673f2a35d257e18863a261d6878f157e
GIT binary patch
literal 280
zcmV+z0q6dS0TlxU08|C;|9MpsjiaHf(*Xj8SO@^gwx2w<P@;i4{g{Tg;cURG`9yf>
z4^X^}(KO8r&*%TM^VFPU^#a>cq^ueA)(?KjMHnvj^Q!fYqdi$r{=c3AZGfOt2{_|V
zW%u4hlO7w<b)s8kM}=6~AolXS;w!W@yO}~6b@v&#R4r?@6SG}YTcH4HfgLU0Xz?s!
zL)%T2;euK1#YSR9*&KX`!+Ej8ju_k0M}W8U9(%D0PAdS@ShADF0h}U)xLiKL$2@gB
z@xsZ_Rlx~ocLk1M#~S!f7EvVo?${p?nEWq_e0-$0lN5o}uWml8jr1#%<8p~RNy#wF
emiIU#YbXBau@;dG$iQINU?zp`I%t;mxZ@~!n2hNF

literal 0
HcmV?d00001

diff --git a/system-config-printer-python3.patch b/system-config-printer-python3.patch
deleted file mode 100644
index b703787..0000000
--- a/system-config-printer-python3.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up system-config-printer-1.5.0/udev/udev-add-printer.python3 system-config-printer-1.5.0/udev/udev-add-printer
---- system-config-printer-1.5.0/udev/udev-add-printer.python3	2014-02-18 14:43:34.000000000 +0000
-+++ system-config-printer-1.5.0/udev/udev-add-printer	2014-08-03 15:02:02.407041071 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -s
-+#!/usr/bin/python3 -s
- 
- ## udev-add-printer
- 
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 75cf30d..728ddc0 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -6,14 +6,13 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.5.0
-Release: 8%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: http://cyberelk.net/tim/data/system-config-printer/1.4/%{name}-%{version}.tar.xz
 Patch1: system-config-printer-no-applet-in-gnome.patch
-Patch2: system-config-printer-python3.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: desktop-file-utils >= 0.2.92
@@ -85,9 +84,6 @@ printers.
 # Don't start the applet in GNOME.
 %patch1 -p1 -b .no-applet-in-gnome
 
-# Explicitly use /usr/bin/python3 in udev-add-printer (bug #1126149).
-%patch2 -p1 -b .python3
-
 %build
 %configure --with-udev-rules
 make %{?_smp_mflags}
@@ -187,6 +183,11 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 exit 0
 
 %changelog
+* Tue Sep  2 2014 Tim Waugh <twaugh@redhat.com> - 1.5.1-1
+- 1.5.1, with some Python3 fixes (bug #1136470),
+  udev-configure-printer fixes, and a fix for a D-Bus service
+  hang (bug #1116756).
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild