From 277de5b9c6617a0587b7f1e34123f04a89ef5fd4 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Oct 23 2015 14:46:40 +0000
Subject: Merge branch 'f22' into f23


---

diff --git a/hplip-no-write-bytecode.patch b/hplip-no-write-bytecode.patch
index 0f0010b..acf9d89 100644
--- a/hplip-no-write-bytecode.patch
+++ b/hplip-no-write-bytecode.patch
@@ -1,6 +1,15 @@
-diff -up hplip-3.15.2/fax/backend/hpfax.py.no-write-bytecode hplip-3.15.2/fax/backend/hpfax.py
---- hplip-3.15.2/fax/backend/hpfax.py.no-write-bytecode	2015-03-03 11:47:12.863274174 +0000
-+++ hplip-3.15.2/fax/backend/hpfax.py	2015-03-03 11:47:19.719336663 +0000
+diff -up hplip-3.15.9/config_usb_printer.py.no-write-bytecode hplip-3.15.9/config_usb_printer.py
+--- hplip-3.15.9/config_usb_printer.py.no-write-bytecode	2015-10-23 15:42:45.252723455 +0100
++++ hplip-3.15.9/config_usb_printer.py	2015-10-23 15:43:06.695592567 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python -B
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2011-2014 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.15.9/fax/backend/hpfax.py.no-write-bytecode hplip-3.15.9/fax/backend/hpfax.py
+--- hplip-3.15.9/fax/backend/hpfax.py.no-write-bytecode	2015-10-23 15:42:21.180873748 +0100
++++ hplip-3.15.9/fax/backend/hpfax.py	2015-10-23 15:42:21.189873691 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python -B
diff --git a/hplip.spec b/hplip.spec
index 6f968bb..5534e23 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -7,7 +7,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.15.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT and BSD
 
 Url: http://hplip.sourceforge.net/
@@ -201,6 +201,7 @@ done
 %patch21 -p1 -b .strncpy
 
 # Don't try to write bytecode cache for hpfax backend (bug #1192761).
+# or for hp-config_usb_printer (bug #1266903).
 %patch22 -p1 -b .no-write-bytecode
 
 # Ignore IOError when logging output (bug #712537).
@@ -449,6 +450,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Fri Oct 23 2015 Tim Waugh <twaugh@redhta.com> - 3.15.9-3
+- Don't try to write bytecode cache for hp-config_usb_printer (bug #1266903).
+
 * Fri Sep 25 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.9-2
 - Don't specify python version in hplip-printer@.service (bug #1266423)