1533869 - hp-firmware:NameError: name 'INTERACTIVE_MODE4' is not defined

This commit is contained in:
Zdenek Dohnal 2018-01-12 17:21:29 +01:00
parent 064767f918
commit 97ba4bc4a5
2 changed files with 20 additions and 1 deletions

12
hplip-typo.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up hplip-3.17.11/firmware.py.typo hplip-3.17.11/firmware.py
--- hplip-3.17.11/firmware.py.typo 2018-01-12 16:50:10.338366719 +0100
+++ hplip-3.17.11/firmware.py 2018-01-12 16:50:33.563184939 +0100
@@ -99,7 +99,7 @@ try:
if mode == GUI_MODE and (ui_toolkit == 'qt4' or ui_toolkit == 'qt5'):
if not utils.canEnterGUIMode4():
log.error("%s -u/--gui requires Qt4/Qt5 GUI support. Entering interactive mode." % __mod__)
- mode = INTERACTIVE_MODE4
+ mode = INTERACTIVE_MODE
elif mode == GUI_MODE and ui_toolkit == 'qt3':
if not utils.canEnterGUIMode():

View File

@ -7,7 +7,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.17.11
Release: 4%{?dist}
Release: 5%{?dist}
License: GPLv2+ and MIT and BSD
Url: https://developers.hp.com/hp-linux-imaging-and-printing
@ -43,6 +43,7 @@ Patch26: hplip-appdata.patch
Patch27: hplip-check-cups.patch
Patch28: hplip-colorlaserjet-mfp-m278-m281.patch
Patch29: hplip-jpeg-compression.patch
Patch30: hplip-typo.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: python3-pillow
@ -235,6 +236,9 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
# Unable to scan and save jpg with color with hp-scan (bug #1528851)
%patch29 -p1 -b .jpeg-compression
# hp-firmware:NameError: name 'INTERACTIVE_MODE4' is not defined (bug #1533869)
%patch30 -p1 -b .typo
sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in
@ -507,6 +511,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig
%changelog
* Fri Jan 12 2018 Zdenek Dohnal <zdohnal@redhat.com> - 3.17.11-5
- 1533869 - hp-firmware:NameError: name 'INTERACTIVE_MODE4' is not defined
* Thu Jan 11 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.17.11-4
- Remove obsolete scriptlets