diff --git a/hplip-setup-errm.patch b/hplip-setup-errm.patch new file mode 100644 index 0000000..c264c32 --- /dev/null +++ b/hplip-setup-errm.patch @@ -0,0 +1,11 @@ +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.spec b/hplip.spec index 4824b3b..0f655f6 100644 --- a/hplip.spec +++ b/hplip.spec @@ -39,6 +39,7 @@ Patch23: hplip-silence-ioerror.patch Patch24: hplip-3165-sourceoption.patch Patch25: hplip-include-ppdh.patch Patch26: hplip-noernie.patch +Patch27: hplip-setup-errm.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: python3-pillow @@ -219,6 +220,9 @@ done # hplip license problem (bug #1364711) %patch26 -p1 -b .no-ernie +# adding error message when hp-setup fail because of missing hplip-gui (bug #1361968) +%patch27 -p1 -b .setup-errm + rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h sed -i.duplex-constraints \ @@ -472,6 +476,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Wed Aug 10 2016 Zdenek Dohnal - 3.16.7-2 +- 1361968 - adding error message when hp-setup fails because of missing hplip-gui + * Mon Aug 08 2016 Zdenek Dohnal - 3.16.7-2 - hplip license problem - removing proprietary ErnieFilters.{cpp,h} + ernieplatform.h, disabling PCL3GUI2 driver (because of using proprietary ErnieFilters)