From 78217e937c6bac563b97028c050d307e76186f79 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Thu, 19 May 2016 14:03:03 +0200
Subject: [PATCH] 3.16.5 (gui moves from Qt4 to Qt5)

---
 .gitignore              |  1 +
 hplip-ui-optional.patch | 24 ++++++++++++------------
 hplip.spec              | 12 ++++++++----
 sources                 |  2 +-
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4fbdd03..8e6e47f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,4 @@ hplip-3.10.6.tar.gz
 /hplip-3.15.11.tar.gz
 /hplip-3.16.2.tar.gz
 /hplip-3.16.3.tar.gz
+/hplip-3.16.5.tar.gz
diff --git a/hplip-ui-optional.patch b/hplip-ui-optional.patch
index d389d6e..0f52c11 100644
--- a/hplip-ui-optional.patch
+++ b/hplip-ui-optional.patch
@@ -1,7 +1,7 @@
-diff -up hplip-3.12.11/base/utils.py.ui-optional hplip-3.12.11/base/utils.py
---- hplip-3.12.11/base/utils.py.ui-optional	2012-11-20 10:55:15.000000000 +0100
-+++ hplip-3.12.11/base/utils.py	2012-11-27 10:03:21.909512264 +0100
-@@ -667,6 +667,13 @@ def checkPyQtImport(): # qt3
+diff -up hplip-3.16.5/base/utils.py.ui-optional hplip-3.16.5/base/utils.py
+--- hplip-3.16.5/base/utils.py.ui-optional	2016-05-04 07:23:22.000000000 +0200
++++ hplip-3.16.5/base/utils.py	2016-05-19 13:52:28.773907101 +0200
+@@ -733,6 +733,13 @@ def checkPyQtImport(): # qt3
          if os.getenv('DISPLAY') and os.getenv('STARTED_FROM_MENU'):
              no_qt_message_gtk()
  
@@ -15,13 +15,13 @@ diff -up hplip-3.12.11/base/utils.py.ui-optional hplip-3.12.11/base/utils.py
          log.error("PyQt not installed. GUI not available. Exiting.")
          return False
  
-@@ -712,7 +719,8 @@ def checkPyQtImport4():
-         import PyQt4
-         import ui4
-     except ImportError:
--        log.error("HPLIP is not installed properly or is installed without graphical support. Please reinstall HPLIP")
-+        # hplip-gui sub-package (Fedora) requires PyQt4
+@@ -783,7 +790,8 @@ def checkPyQtImport4():
+         import PyQt5
+         import ui5
+     else:
+-        log.debug("HPLIP is not installed properly or is installed without graphical support. Please reinstall HPLIP again")
++        # hplip-gui sub-package (Fedora) requires python3-qt5
 +        log.error("Install the hplip-gui package for graphical support.")
          return False
-     else:
-         return True
+     return True
+ 
diff --git a/hplip.spec b/hplip.spec
index dd5c986..68c65a0 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -6,7 +6,7 @@
 
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.16.3
+Version: 3.16.5
 Release: 1%{?dist}
 License: GPLv2+ and MIT and BSD
 
@@ -91,7 +91,7 @@ Libraries needed by HPLIP.
 %package gui
 Summary: HPLIP graphical tools
 License: BSD
-Requires: python3-PyQt4
+Requires: python3-qt5
 Requires: python3-reportlab
 # hpssd.py
 Requires: python3-gobject
@@ -229,7 +229,8 @@ autoreconf --verbose --force --install
 %configure \
         --enable-scan-build --enable-gui-build --enable-fax-build \
         --disable-foomatic-rip-hplip-install --enable-pp-build \
-        --enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
+        --disable-qt4 --enable-qt5 \
+        --enable-hpcups-install --enable-cups-drv-install \
         --enable-foomatic-drv-install \
         --enable-hpijs-install \
         --disable-policykit --with-mimedir=%{_datadir}/cups/mime PYTHON=%{__python3}
@@ -443,7 +444,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %{_datadir}/hplip/toolbox.py*
 # Directories
 %{_datadir}/hplip/data/images
-%{_datadir}/hplip/ui4
+%{_datadir}/hplip/ui5
 
 %files -n libsane-hpaio
 %{_libdir}/sane/libsane-*.so*
@@ -457,6 +458,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu May 19 2016 Jiri Popelka <jpopelka@redhat.com> - 3.16.5-1
+- 3.16.5 (gui moves from Qt4 to Qt5)
+
 * Fri Mar 18 2016 zdohnal <zdohnal@redhat.com> - 3.16.3-1
 - 3.16.3
 
diff --git a/sources b/sources
index 0ecf173..00ee9a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43379bb4790fa7252254094c294f8930  hplip-3.16.3.tar.gz
+3f50c45c52b2adaee8d9ff32db8c4e6e  hplip-3.16.5.tar.gz