diff --git a/hplip.changes b/hplip.changes index 654e816..6f6b4bd 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 23 17:23:15 UTC 2021 - Martin Wilck + +- Remove %is_opensuse from spec file (jsc#SLE-11640) + This will build hp-scan-utils package on SLE, too, where it + has unsatisfiable dependencies. + ------------------------------------------------------------------- Sun Feb 14 22:34:21 UTC 2021 - Stephan Hemeier diff --git a/hplip.spec b/hplip.spec index c20448c..98237c6 100644 --- a/hplip.spec +++ b/hplip.spec @@ -397,24 +397,6 @@ sed -i 's|ppd/hpcups/\*.ppd.gz ||g' Makefile %install %make_install -# SLE does not provide python-pillow (PIL) (bsc#1131613) and thus has no hp-scan -# and related library code. -# We can't use --disable-scan-build, as that would disable the SANE -# backend, too. -# On openSUSE, these files go into the hplip-scan package (see below). -# Remove these before running pyX_compile -%if !0%{?is_opensuse} -rm -f %{buildroot}%{_datadir}/hplip/scan.py \ - %{buildroot}%{_datadir}/hplip/uiscan.py \ - %{buildroot}%{_datadir}/hplip/base/imageprocessing.py \ - %{buildroot}%{_datadir}/hplip/ui5/scandialog.py \ - %{buildroot}%{_bindir}/hp-scan \ - %{buildroot}%{_bindir}/hp-uiscan \ - %{buildroot}%{_datadir}/applications/hp-uiscan.desktop \ - %{buildroot}%{_libdir}/python%{pyver}/site-packages/scanext.* -rm -rf %{buildroot}%{_datadir}/hplip/scan -%endif - # Make and install Python compiled bytecode files %py3_compile %{buildroot}%{_datadir}/hplip %py3_compile -O %{buildroot}%{_datadir}/hplip @@ -556,9 +538,7 @@ set -x popd # Replace the invalid Desktop categories %suse_update_desktop_file -r %{buildroot}%{_datadir}/applications/hplip.desktop System HardwareSettings -%if 0%{?is_opensuse} %suse_update_desktop_file -r %{buildroot}%{_datadir}/applications/hp-uiscan.desktop System HardwareSettings -%endif # Let suse_update_desktop_file add X-SuSE-translate key to /etc/xdg/autostart/hplip-systray.desktop # so that we can update its translations with translation-only packages. @@ -676,7 +656,6 @@ exit 0 # The scanning utils depend on PIL and python3-scikit-image, # which are not available in SLE -%if 0%{?is_opensuse} %files scan-utils %{_datadir}/applications/hp-uiscan.desktop %{_libdir}/python%{pyver}/site-packages/scanext.* @@ -691,7 +670,6 @@ exit 0 %{_datadir}/hplip/__pycache__/scan.* %{_datadir}/hplip/base/__pycache__/imageprocessing.* %{_datadir}/hplip/ui5/__pycache__/scandialog.* -%endif %files hpijs %config %{_sysconfdir}/hp/