From 911f38a20018660b4b3c6150d73ed72e2998f66c Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Wed, 10 Aug 2016 18:31:16 +0200
Subject: [PATCH] correcting previous commit

---
 hplip-setup-errm.patch  | 11 -----------
 hplip-ui-optional.patch | 14 +++++++++++---
 hplip.spec              |  9 ++++-----
 3 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 hplip-setup-errm.patch

diff --git a/hplip-setup-errm.patch b/hplip-setup-errm.patch
deleted file mode 100644
index c264c32..0000000
--- a/hplip-setup-errm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up hplip-3.16.7/base/utils.py.setup-errm hplip-3.16.7/base/utils.py
---- hplip-3.16.7/base/utils.py.setup-errm	2016-08-10 16:33:06.781765887 +0200
-+++ hplip-3.16.7/base/utils.py	2016-08-10 16:33:27.060588323 +0200
-@@ -789,6 +789,7 @@ def checkPyQtImport4():
-     except ImportError:
-         import PyQt5
-         import ui5
-+        log.error("Install the hplip-gui package for graphical support.")
-     else:
-         # hplip-gui sub-package (Fedora) requires python3-qt5
-         log.error("Install the hplip-gui package for graphical support.")
diff --git a/hplip-ui-optional.patch b/hplip-ui-optional.patch
index 0f52c11..647082e 100644
--- a/hplip-ui-optional.patch
+++ b/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
---- 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
+diff -up hplip-3.16.7/base/utils.py.ui-optional hplip-3.16.7/base/utils.py
+--- hplip-3.16.7/base/utils.py.ui-optional	2016-07-15 12:12:28.000000000 +0200
++++ hplip-3.16.7/base/utils.py	2016-08-10 18:02:25.126595787 +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,11 @@ 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")
+ 
+ 
diff --git a/hplip.spec b/hplip.spec
index dda99f1..72e479f 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -7,7 +7,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.16.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT and BSD
 
 Url: http://hplip.sourceforge.net/
@@ -38,7 +38,6 @@ Patch22: hplip-no-write-bytecode.patch
 Patch23: hplip-silence-ioerror.patch
 Patch24: hplip-3165-sourceoption.patch
 Patch25: hplip-include-ppdh.patch
-Patch26: hplip-setup-errm.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: python3-pillow
@@ -216,9 +215,6 @@ done
 # FTBFS error when rebasing to 3.16.5 - need to include ppd.h
 %patch25 -p1 -b .include-ppdh
 
-# adding error message when hp-setup fail because of missing hplip-gui (bug #1361968)
-%patch26 -p1 -b .setup-errm
-
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
     prnt/drv/hpcups.drv.in
@@ -470,6 +466,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Aug 10 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.7-3
+- editing previous commit
+
 * Wed Aug 10 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.7-2
 - 1361968 - adding error message when hp-setup fails because of missing hplip-gui