From c38528a2cbffed99e8eedff35692f1042c418429 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Thu, 9 May 2013 15:42:47 +0100
Subject: [PATCH] 1.4.1.

Changes including:
  - Don't call into Gtk directly from scp-dbus-service (bug #951710).
  - Handle errors from Gdk.color_parse() correctly.
  - Fix creating of empty pixbuf.
  - Make man page and --help output consistent.
  - Some codec fixes (bug #957343, bug #957444, bug #960567).
  - Updated translations (bug #951647).
  - Use xxx-supported values for number-up and sides options
    (bug #923841).
---
 .gitignore                             |   1 +
 sources                                |   2 +-
 system-config-printer-1.4.0.tar.xz.sig | Bin 280 -> 0 bytes
 system-config-printer-1.4.1.tar.xz.sig | Bin 0 -> 280 bytes
 system-config-printer.spec             |  27 ++++++++++++-------------
 5 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 system-config-printer-1.4.0.tar.xz.sig
 create mode 100644 system-config-printer-1.4.1.tar.xz.sig

diff --git a/.gitignore b/.gitignore
index c7879cc..b0024ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -243,3 +243,4 @@ pycups-1.9.51.tar.bz2
 /system-config-printer-1.3.12.tar.xz
 /system-config-printer-1.3.13.tar.xz
 /system-config-printer-1.4.0.tar.xz
+/system-config-printer-1.4.1.tar.xz
diff --git a/sources b/sources
index e229a74..a13708a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3267c2eac454f470c0659034196d2668  system-config-printer-1.4.0.tar.xz
+3d794eb88c5813c3024b181677a602dd  system-config-printer-1.4.1.tar.xz
diff --git a/system-config-printer-1.4.0.tar.xz.sig b/system-config-printer-1.4.0.tar.xz.sig
deleted file mode 100644
index 432ad8b1984416d9f4522d63f6c298f8cad48923..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 280
zcmV+z0q6dS0TlxU08vu>*Y3rUs`TEJECB)_IS2kes(#s@4D`455jYkM1bH^@S)W5N
zr2F@YN)b<+d|ft?^OW#mN8e-#S=@CwKZ$$fWJ+g6hDM<oUV<E@aZQ$V;5T!9k@euM
zk}{aAX1`w;G#|`K1Xfk5NO+C2Y0u!5L#-3J5DsQ+risuTg9>N4AG0}RkHEIm)aNAs
zaQuNMy7ueg6I{c5O5Mg&_)uej?u^;9GfU#lQEfIT%OhJ>5nmTD^zKy)mj`Exd!P~a
zv2(x6Zb)=i6CVb-HiHi~l}(bH^ofKO<K}X@#4?{*85sl6Z~`9X-W8X-f~O8hgMW7X
eKg4nt;M0Iu&>1)2`<Ton3_+OLj=;Flc`*$YfrW+u

diff --git a/system-config-printer-1.4.1.tar.xz.sig b/system-config-printer-1.4.1.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..8b59bdb02c7ac2ee46ae77665c90289bf3f5e739
GIT binary patch
literal 280
zcmV+z0q6dS0TlxU08xvyZtlgAs`TEJECB*wZwLQv`C0vkjD>RZMgrmZr*uDZcD>4u
z*-z(Se8S*6%2s?(2QLgK51?G1ofZfmwR;aX1>dk6kG5Zpc{w(T`0q1(MuB}n1`zCx
zcZuZt{MSSPEGyX}V3E0l#@Pf=2%F&R(p>c_1q_p0<3dvG_=--+cw{_5MCMMc>t_&E
z)o2W(fiK9nt%6y#w?9hV39)KNG;^?9Yd=Cdf-%<Zz5fN-h5;AatlkJ<1IvNG8l;>h
z{AHC9fZ8CygRJ9+OajZga;M;h(rjpm)7fu~i;Ol1dS!JIh0@sWEqc`~cUN!8Ez_ly
e{~+~?H*%X9xTRI&q9BW#F;zU(&8TS4EOM%8+KCka

literal 0
HcmV?d00001

diff --git a/system-config-printer.spec b/system-config-printer.spec
index d29b2bb..164b97f 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -1,15 +1,12 @@
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.4.0
-Release: 4%{?dist}
+Version: 1.4.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.3/%{name}-%{version}.tar.xz
 Patch1: system-config-printer-no-applet-in-gnome.patch
-Patch2: system-config-printer-DISPLAY.patch
-Patch3: system-config-printer-encoding.patch
-Patch4: system-config-printer-quit.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: desktop-file-utils >= 0.2.92
@@ -71,15 +68,6 @@ printers.
 # Don't start the applet in GNOME.
 %patch1 -p1 -b .no-applet-in-gnome
 
-# Better behaviour when trying to run without valid DISPLAY (bug # #948240).
-%patch2 -p1 -b .DISPLAY
-
-# Fixed some printer name encoding issues (bug #950162).
-%patch3 -p1 -b .encoding
-
-# Don't delete mainlist too early when quitting (bug #915483).
-%patch4 -p1 -b .quit
-
 %build
 %configure --with-udev-rules
 
@@ -179,6 +167,17 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 exit 0
 
 %changelog
+* Thu May  9 2013 Tim Waugh <twaugh@redhat.com> 1.4.1-1
+- 1.4.1:
+  - Don't call into Gtk directly from scp-dbus-service (bug #951710).
+  - Handle errors from Gdk.color_parse() correctly.
+  - Fix creating of empty pixbuf.
+  - Make man page and --help output consistent.
+  - Some codec fixes (bug #957343, bug #957444, bug #960567).
+  - Updated translations (bug #951647).
+  - Use xxx-supported values for number-up and sides options
+    (bug #923841).
+
 * Mon Apr 15 2013 Tim Waugh <twaugh@redhat.com> 1.4.0-4
 - Don't call into Gtk directly from scp-dbus-service (bug #951710).
 - Adjusted dependencies now we use GObject introspection.