From 7e44942d45690b583eb85878e3777f582f1a6183 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Jan 04 2016 16:02:15 +0000
Subject: Merge branch 'f22' into f23


---

diff --git a/hplip-no-write-bytecode.patch b/hplip-no-write-bytecode.patch
index 8bd1200..55d6147 100644
--- a/hplip-no-write-bytecode.patch
+++ b/hplip-no-write-bytecode.patch
@@ -16,3 +16,12 @@ diff -up hplip-3.15.11/fax/backend/hpfax.py.no-write-bytecode hplip-3.15.11/fax/
  # -*- coding: utf-8 -*-
  #
  # (c) Copyright 2003-2015 HP Development Company, L.P.
+diff -up hplip-3.15.11/prnt/filters/hpps.no-write-bytecode hplip-3.15.9/prnt/filters/hpps
+--- hplip-3.15.11/prnt/filters/hpps.no-write-bytecode	2016-01-04 16:44:08.000000000 +0100
++++ hplip-3.15.11/prnt/filters/hpps	2016-01-04 16:50:11.272921194 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python -B
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2015 HP Development Company, L.P.
diff --git a/hplip.spec b/hplip.spec
index 1368144..b38aca8 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -7,7 +7,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.15.11
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and MIT and BSD
 
 Url: http://hplip.sourceforge.net/
@@ -199,8 +199,9 @@ done
 # Fixed uses of strncpy throughout.
 %patch21 -p1 -b .strncpy
 
-# Don't try to write bytecode cache for hpfax backend (bug #1192761).
-# or for hp-config_usb_printer (bug #1266903).
+# Don't try to write bytecode cache for hpfax backend (bug #1192761)
+# or hp-config_usb_printer (bug #1266903)
+# or hpps filter (bug #1241548).
 %patch22 -p1 -b .no-write-bytecode
 
 # Ignore IOError when logging output (bug #712537).
@@ -456,6 +457,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Jan 04 2016 Jiri Popelka <jpopelka@redhat.com> - 3.15.11-4
+- Don't try to write bytecode cache for hpps filter (bug #1241548).
+
 * Thu Dec 10 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.11-3
 - move 56-hpmud.rules into main package completely (bug #1033952)