Fix build, switched to python3-qt5

This commit is contained in:
Denis Silakov 2016-09-26 16:58:08 +03:00
parent d32933d694
commit 354104e268
2 changed files with 9 additions and 6 deletions

View file

@ -1,6 +1,6 @@
diff -Naur hplip-3.16.8.orig/base/utils.py hplip-3.16.8/base/utils.py
--- hplip-3.16.8.orig/base/utils.py 2016-09-26 10:11:28.239375103 +0300
+++ hplip-3.16.8/base/utils.py 2016-09-26 10:12:09.905940491 +0300
--- hplip-3.16.8.orig/base/utils.py 2016-09-26 16:52:04.102641360 +0300
+++ hplip-3.16.8/base/utils.py 2016-09-26 16:53:41.332317742 +0300
@@ -733,6 +733,13 @@
if os.getenv('DISPLAY') and os.getenv('STARTED_FROM_MENU'):
no_qt_message_gtk()

View file

@ -246,8 +246,11 @@ Python 2 modules needed by HP plugin.
%package gui
Summary: HPLIP graphical tools
Group: System/Printing
Requires: python3-qt4-gui
Requires: %{name} = %{version}-%{release}
Requires: python3-qt5-core
Requires: python3-qt5-dbus
Requires: python3-qt5-gui
Requires: python3-qt5-widgets
Requires: usermode
%description gui
@ -301,7 +304,7 @@ flash memory cards.
%patch102 -p1 -b .strstr-const
# Make utils.checkPyQtImport() look for the gui sub-package (RH bug #243273).
%patch103 -p1 -b .ui-optional
# % patch103 -p1 -b .ui-optional
# Make sure to avoid handwritten asm.
%patch104 -p1 -b .no-asm
@ -514,7 +517,7 @@ WITHOUT_SANE="--without-sane"
--enable-gui-build \
--enable-fax-build \
--enable-pp-build \
--enable-qt4 --disable-qt3 \
--enable-qt5 --disable-qt4 \
--enable-hpcups-install \
--enable-cups-drv-install \
--enable-cups-ppd-install \
@ -909,7 +912,7 @@ fi
%{_datadir}/hplip/toolbox.py*
# Directories
%{_datadir}/hplip/data/images
%{_datadir}/hplip/ui4
%{_datadir}/hplip/ui5
%files hpijs
%{_bindir}/hpijs