From e68db36db3f330192544a370e7329347871d8d78 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Thu, 17 Jul 2014 12:41:56 +0100
Subject: [PATCH] 1.5.0 (now Python3).

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

diff --git a/.gitignore b/.gitignore
index 3318425..f0e8b2c 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.5.0.tar.xz
diff --git a/sources b/sources
index 26b971c..99e452e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-defcfe0e29ab7baafc042a28f5be5949  system-config-printer-1.4.5.tar.xz
+264dd8edde7460cae411fe54bc22c9a6  system-config-printer-1.5.0.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.5.0.tar.xz.sig b/system-config-printer-1.5.0.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..8f4bdd12c76334215fda997ab00f04cf10b552e7
GIT binary patch
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

literal 0
HcmV?d00001

diff --git a/system-config-printer.spec b/system-config-printer.spec
index 65a569d..52140b2 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -1,14 +1,15 @@
+# Turn off the brp-python-bytecompile script
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
+
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.4.5
-Release: 3%{?dist}
+Version: 1.5.0
+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
@@ -18,6 +19,7 @@ BuildRequires: libusb1-devel
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: xmlto
 BuildRequires: systemd-units, systemd-devel
+BuildRequires: python3-devel
 
 Requires: gobject-introspection%{?_isa}
 Requires: pygobject3-base%{?_isa}
@@ -42,7 +44,6 @@ the user to configure a CUPS print server.
 %package libs
 Summary: Libraries and shared code for printer administration tool
 Group: System Environment/Base
-Requires: python
 Requires: python-cups >= 1.9.60
 Requires: gobject-introspection
 Requires: pygobject3-base
@@ -72,14 +73,6 @@ printers.
 # 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}
@@ -90,6 +83,11 @@ make DESTDIR=%buildroot install
 %{__mkdir_p} %buildroot%{_localstatedir}/run/udev-configure-printer
 touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 
+# Manually invoke the python byte compile macro for each path that
+# needs byte compilation
+%py_byte_compile %{__python3} %%{buildroot}%{python3_sitelib}/cupshelpers
+%py_byte_compile %{__python3} %%{buildroot}%{datadir}/system-config-printer
+
 %find_lang system-config-printer
 
 %files libs -f system-config-printer.lang
@@ -131,15 +129,8 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 %{_datadir}/%{name}/timedops.py*
 %dir %{_sysconfdir}/cupshelpers
 %config(noreplace) %{_sysconfdir}/cupshelpers/preferreddrivers.xml
-%dir %{python_sitelib}/cupshelpers
-%{python_sitelib}/cupshelpers/__init__.py*
-%{python_sitelib}/cupshelpers/config.py*
-%{python_sitelib}/cupshelpers/cupshelpers.py*
-%{python_sitelib}/cupshelpers/installdriver.py*
-%{python_sitelib}/cupshelpers/openprinting.py*
-%{python_sitelib}/cupshelpers/ppds.py*
-%{python_sitelib}/cupshelpers/xmldriverprefs.py*
-%{python_sitelib}/*.egg-info
+%{python3_sitelib}/cupshelpers
+%{python3_sitelib}/*.egg-info
 
 %files udev
 %{_prefix}/lib/udev/rules.d/*.rules
@@ -178,6 +169,9 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 exit 0
 
 %changelog
+* Thu Jul 17 2014 Tim Waugh <twaugh@redhat.com> 1.5.0-1
+- 1.5.0 (now Python3).
+
 * Mon Jul 14 2014 Tim Waugh <twaugh@redhat.com> 1.4.5-3
 - Fix job retrieval (bug #1119222).