change in patch hplip-ui-optional - message about installing hplip-gui

hplip-ui-optional.patch

@@ -1,6 +1,6 @@
-diff -up hplip-3.16.5/base/utils.py.ui-optional hplip-3.16.5/base/utils.py
+diff -up hplip-3.16.7/base/utils.py.ui-optional hplip-3.16.7/base/utils.py
---- hplip-3.16.5/base/utils.py.ui-optional	2016-05-04 07:23:22.000000000 +0200
+--- hplip-3.16.7/base/utils.py.ui-optional	2016-07-15 12:12:28.000000000 +0200
-+++ hplip-3.16.5/base/utils.py	2016-05-19 13:52:28.773907101 +0200
++++ hplip-3.16.7/base/utils.py	2016-08-12 10:12:24.599398769 +0200
 @@ -733,6 +733,13 @@ def checkPyQtImport(): # qt3
          if os.getenv('DISPLAY') and os.getenv('STARTED_FROM_MENU'):
              no_qt_message_gtk()
@@ -25,3 +25,30 @@ diff -up hplip-3.16.5/base/utils.py.ui-optional hplip-3.16.5/base/utils.py
          return False
      return True
  
+@@ -2434,6 +2442,7 @@ def checkPyQtImport45():
+     except ImportError as e:
+         log.debug(e)
+ 
++    log.error("Install the hplip-gui package for graphical support.")
+     raise ImportError("GUI Modules PyQt4 and PyQt5 are not installed")
+ 
+ 
+@@ -2455,6 +2464,7 @@ def import_dialog(ui_toolkit):
+             return  (QApplication, "ui4")
+         except ImportError as e:
+             log.error(e)
++            log.error("Unable to load Qt support. Is hplip-gui package installed?")
+             sys.exit(1)
+     elif ui_toolkit == "qt5":
+         try:
+@@ -2463,9 +2473,7 @@ def import_dialog(ui_toolkit):
+             return (QApplication, "ui5")
+         except ImportError as e:
+             log.error(e)
+-            sys.exit(1)
+-        else:
+-            log.error("Unable to load Qt support. Is it installed?")
++            log.error("Unable to load Qt support. Is hplip-gui package installed?")
+             sys.exit(1)
+ 
+ 

hplip.spec

@@ -7,7 +7,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.16.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT and BSD
 
 Url: http://hplip.sourceforge.net/
@@ -462,6 +462,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Aug 22 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.7-2
+- change in patch hplip-ui-optional - message about installing hplip-gui
+
 * Thu Jul 21 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.7-1
 - 1358761 - Rebase 3.16.7