diff --git a/hplip.changes b/hplip.changes index 2169dd8..4afc702 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 9 20:11:02 UTC 2019 - Martin Wilck + +- Remove dependency on python3-pillow on SLE (bsc#1131613), and + remove the hp-scan tool that needs it. "scanimage" must be used + instead. + ------------------------------------------------------------------- Mon Mar 11 11:36:36 UTC 2019 - Martin Wilck diff --git a/hplip.spec b/hplip.spec index a5342e2..0390f33 100644 --- a/hplip.spec +++ b/hplip.spec @@ -165,7 +165,11 @@ Requires: foomatic-filters # Therefore the hplip main package which is intended # to get "all the HPLIP stuff" installed has the RPM requirement: Requires: %{pymod %gobject} + +# SLE does not provide python-pillow (PIL) (bsc#1131613) +%if 0%{?is_opensuse} Requires: %{pymod Pillow} +%endif Requires: ghostscript %if %use_qt5 @@ -647,6 +651,18 @@ popd # Install the man page for /usr/bin/hpijs: install -d %{buildroot}%{_mandir}/man1 install -m 644 %{SOURCE102} %{buildroot}%{_mandir}/man1/ + +# SLE does not provide python-pillow (PIL) (bsc#1131613) +%if !0%{?is_opensuse} +rm -f %{buildroot}/usr/share/hplip/scan.py %{buildroot}%{_bindir}/hp-scan +cat >%{buildroot}%{_bindir}/hp-scan <&2 +exit 1 +EOF +chmod a+x %{buildroot}%{_bindir}/hp-scan +%endif + # Run fdupes: # The RPM macro fdupes runs /usr/bin/fdupes that links files with identical content. # Never run fdupes carelessly over the whole buildroot directory