diff --git a/hplip-fedora-gui.patch b/hplip-fedora-gui.patch index 47c9312..499f4da 100644 --- a/hplip-fedora-gui.patch +++ b/hplip-fedora-gui.patch @@ -5,7 +5,7 @@ index d493b54..401dc41 100644 @@ -727,8 +727,8 @@ def canEnterGUIMode4(): # qt4 except ImportError: try: - import ui5 + import ui5.setupdialog - except ImportError as e: - log.warn(e) + except ImportError: @@ -22,7 +22,7 @@ index d493b54..401dc41 100644 log.error("PyQt not installed. GUI not available. Exiting.") @@ -800,6 +801,7 @@ def checkPyQtImport4(): - import ui5 + import ui5.setupdialog except ImportError: log.debug('GUI not available.') + log.error('hplip-gui not installed. GUI not available.') diff --git a/hplip-ui-optional.patch b/hplip-ui-optional.patch index 4b3f525..d724a30 100644 --- a/hplip-ui-optional.patch +++ b/hplip-ui-optional.patch @@ -27,7 +27,7 @@ index 98437a3..9b8813b 100644 + import ui4 + except ImportError: + try: -+ import ui5 ++ import ui5.setupdialog + except ImportError as e: + log.warn(e) + return False @@ -58,7 +58,7 @@ index 98437a3..9b8813b 100644 - return False + try: + import PyQt5 -+ import ui5 ++ import ui5.setupdialog + except ImportError: + log.debug('GUI not available.') + return False diff --git a/hplip.spec b/hplip.spec index 269e869..2d7bc5d 100644 --- a/hplip.spec +++ b/hplip.spec @@ -7,7 +7,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.21.2 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ and MIT and BSD and IJG and GPLv2+ with exceptions and ISC Url: https://developers.hp.com/hp-linux-imaging-and-printing @@ -871,6 +871,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio %changelog +* Fri Dec 03 2021 Zdenek Dohnal - 3.21.2-15 +- 2028697 - hp-setup trackbacks when hplip-gui RPM is not installed + * Tue Nov 23 2021 Zdenek Dohnal - 3.21.2-14 - 2025853 - hplip: double "and" in license