From 63fad12f8e33b6a3499a62ec4d081e57b0cae7bb Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Fri, 17 Oct 2014 17:04:50 +0100
Subject: [PATCH] 1.4.6.

---
 .gitignore                             |   1 +
 sources                                |   2 +-
 system-config-printer-1.4.5.tar.xz.sig | Bin 280 -> 0 bytes
 system-config-printer-1.4.6.tar.xz.sig | Bin 0 -> 280 bytes
 system-config-printer.spec             |  23 +++++++----------------
 5 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 system-config-printer-1.4.5.tar.xz.sig
 create mode 100644 system-config-printer-1.4.6.tar.xz.sig

diff --git a/.gitignore b/.gitignore
index 3318425..5f969b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -248,3 +248,4 @@ pycups-1.9.51.tar.bz2
 /system-config-printer-1.4.3.tar.xz
 /system-config-printer-1.4.4.tar.xz
 /system-config-printer-1.4.5.tar.xz
+/system-config-printer-1.4.6.tar.xz
diff --git a/sources b/sources
index 26b971c..1c674ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-defcfe0e29ab7baafc042a28f5be5949  system-config-printer-1.4.5.tar.xz
+510110a7bee8bf81d3fe19eddafa91ed  system-config-printer-1.4.6.tar.xz
diff --git a/system-config-printer-1.4.5.tar.xz.sig b/system-config-printer-1.4.5.tar.xz.sig
deleted file mode 100644
index 6cf872c6825689152037eb67d3c73bf39a5e9cf1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 280
zcmV+z0q6dS0TlxU08_Tm=6O{TjiaHf(*Xi@^auYzsFp_jqn~#haGu6HRv9HZ;QpDu
z7dnxLU&NdUeSZ!_Ai0|82U|c_s&KQVC5`cnbSDRIFi??$ur|zUMgw`6I<kHn+eI5!
znrH(rTST`aV?DPB3DWDQexzUG|6$)(w2G-E83O%5gG(+~66a^yD!5Yun-8sAW2l-X
zRf|)25gJL9ZKAlKUMIt1IDer&S*K9pU1V2)QLvPY0SF^f;{BuUyiez|<0?IU3ZZ>#
z%P)4>@B?IIFw~sX#JNJFEx2mZGu-_vl=PMY4keUdW>Vs-N0w=iuaf|@UT-pYyX=rs
e*}r&XkF(D`&a(gCP*jgGp%;?UD(jD?FLI*s--Ay8

diff --git a/system-config-printer-1.4.6.tar.xz.sig b/system-config-printer-1.4.6.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..284c33f07b03173cf36bf39206f2ebb08e2af6e8
GIT binary patch
literal 280
zcmV+z0q6dS0TlxU08~LX$az%~jiaHf(*XjEN(cbDRS?dBZxl58Of|Z^tMVw=B!1q4
z1HC=-EIXP|^s09a!b4LMUwKu83ne~BhaO=C_ao92M@=WkRe{nV0YZ(M^ITc@SxKh%
zzWt@!ok!><D1ajUVN)G&)`DK$?}!6q*)k%2lVvYdH8pw|$X&nO6b?X8Akn@fig<t+
z>Yf2oPl1WhUxv(e_;z5MrUQvlL6Jb?v5-`I6xKB7dr2$<E5zZ^?yc@@B_NU7faURL
zL8$1wuIpHPa!q)C1*!{^<<bgsNe~rr;WSj^T^{dgl_iJy&Cx=kw3`P)WIi}50j`pg
eo1wZhez0`zUmDe-=u=m`RA?iJA3oTR&_&L3zkuif

literal 0
HcmV?d00001

diff --git a/system-config-printer.spec b/system-config-printer.spec
index ddedab6..629285e 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -1,14 +1,11 @@
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.4.5
-Release: 3%{?dist}
+Version: 1.4.6
+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-permission.patch
-Patch3: system-config-printer-retrieve.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: desktop-file-utils >= 0.2.92
@@ -69,17 +66,6 @@ printers.
 %prep
 %setup -q
 
-# Don't start the applet in GNOME.
-%patch1 -p1 -b .no-applet-in-gnome
-
-# Handle failure when cups-pk-helper not installed (bug #1118836).
-%patch2 -p1 -b .permission
-
-# Fix job retrieval (bug #1119222).
-%patch3 -p1 -b .retrieve
-
-sed -i.cflags-override -e '/^CFLAGS/d' Makefile.{am,in}
-
 %build
 %configure --with-udev-rules
 make %{?_smp_mflags}
@@ -118,6 +104,7 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 %{_datadir}/%{name}/newprinter.py*
 %{_datadir}/%{name}/options.py*
 %{_datadir}/%{name}/optionwidgets.py*
+%{_datadir}/%{name}/OpenPrintingRequest.py*
 %{_datadir}/%{name}/PhysicalDevice.py*
 %{_datadir}/%{name}/ppdcache.py*
 %{_datadir}/%{name}/ppdippstr.py*
@@ -171,6 +158,7 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 %{_datadir}/%{name}/ui/*.ui
 %{_datadir}/applications/system-config-printer.desktop
 %{_sysconfdir}/xdg/autostart/print-applet.desktop
+%{_datadir}/appdata/*.appdata.xml
 %{_mandir}/man1/*
 
 %post
@@ -178,6 +166,9 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 exit 0
 
 %changelog
+* Fri Oct 17 2014 Tim Waugh <twaugh@redhat.com> 1.4.6-1
+- 1.4.6.
+
 * Mon Jul 14 2014 Tim Waugh <twaugh@redhat.com> 1.4.5-3
 - Fix job retrieval (bug #1119222).