1361968 - adding error message when hp-setup fails because of missing hplip-gui

This commit is contained in:
Zdenek Dohnal 2016-08-10 16:53:13 +02:00
parent 95196cb124
commit fe29a21e41
2 changed files with 20 additions and 1 deletions

11
hplip-setup-errm.patch Normal file
View File

@ -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.")

View File

@ -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/
@ -38,6 +38,7 @@ 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
@ -212,8 +213,12 @@ done
# [abrt] hplip: hp-scan:663:<module>:NameError: name 'source_option' is not defined (bug #1341304)
%patch24 -p1 -b .sourceoption
# 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
@ -465,6 +470,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-2
- 1361968 - adding error message when hp-setup fails because of missing hplip-gui
* Thu Jul 21 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.7-1
- 1358761 - Rebase 3.16.7