diff --git a/hplip.spec b/hplip.spec index 0bf5b34..98a4838 100644 --- a/hplip.spec +++ b/hplip.spec @@ -7,7 +7,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.20.6 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC Url: https://developers.hp.com/hp-linux-imaging-and-printing @@ -230,6 +230,7 @@ Requires: python3 %description libs Libraries needed by HPLIP. +%if 0%{?rhel} <= 8 || 0%{?fedora} %package gui Summary: HPLIP graphical tools License: BSD @@ -243,6 +244,7 @@ Requires: libsane-hpaio%{?_isa} = %{version}-%{release} %description gui HPLIP graphical tools. +%endif %package -n libsane-hpaio Summary: SANE driver for scanners in HP's multi-function devices @@ -525,6 +527,7 @@ install -p -m644 %{buildroot}%{_datadir}/hplip/data/images/32x32/hp_logo.png \ install -p -m644 %{buildroot}%{_datadir}/hplip/data/images/64x64/hp_logo.png \ %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/hp_logo.png +%if 0%{?rhel} <= 8 || 0%{?fedora} mkdir -p %{buildroot}%{_datadir}/applications sed -i -e '/^Categories=/d' hplip.desktop # Encoding key is deprecated @@ -551,6 +554,7 @@ desktop-file-install \ --add-category Scanning \ --add-category Application \ hp-uiscan.desktop +%endif # Regenerate hpcups PPDs on upgrade if necessary (bug #579355). install -p -m755 %{SOURCE1} %{buildroot}%{_bindir}/hpcups-update-ppds @@ -694,6 +698,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop # Python extension %{python3_sitearch}/* +%if 0%{?rhel} <= 8 || 0%{?fedora} %files gui %{_bindir}/hp-check %{_bindir}/hp-devicesettings @@ -724,6 +729,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop # Directories %{_datadir}/hplip/data/images %{_datadir}/hplip/ui5 +%endif %files -n libsane-hpaio %{_libdir}/sane/libsane-*.so @@ -732,6 +738,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio %changelog +* Wed Aug 05 2020 Zdenek Dohnal - 3.20.6-7 +- don't build gui for newer RHELs + * Sat Aug 01 2020 Fedora Release Engineering - 3.20.6-6 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild