pool/hplip
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 692708 from home:mwilck:branches:Printing

Browse Source 
- Remove dependency on python3-pillow on SLE (bsc#1131613), and 
  remove the hp-scan tool that needs it. "scanimage" must be used
  instead.

OBS-URL: https://build.opensuse.org/request/show/692708
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=168
This commit is contained in:
Martin Wilck 2019-04-09 20:41:23 +00:00 committed by Git OBS Bridge
parent ab0c39f3bc
commit d6e6ace3b0
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hplip.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Apr 9 20:11:02 UTC 2019 - Martin Wilck <mwilck@suse.com>
- 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 <mwilck@suse.com> Mon Mar 11 11:36:36 UTC 2019 - Martin Wilck <mwilck@suse.com>

16
hplip.spec
View File

@ -165,7 +165,11 @@ Requires: foomatic-filters
# Therefore the hplip main package which is intended # Therefore the hplip main package which is intended
# to get "all the HPLIP stuff" installed has the RPM requirement: # to get "all the HPLIP stuff" installed has the RPM requirement:
Requires: %{pymod %gobject} Requires: %{pymod %gobject}
# SLE does not provide python-pillow (PIL) (bsc#1131613)
%if 0%{?is_opensuse}
Requires: %{pymod Pillow} Requires: %{pymod Pillow}
%endif
Requires: ghostscript Requires: ghostscript
%if %use_qt5 %if %use_qt5
@ -647,6 +651,18 @@ popd
# Install the man page for /usr/bin/hpijs: # Install the man page for /usr/bin/hpijs:
install -d %{buildroot}%{_mandir}/man1 install -d %{buildroot}%{_mandir}/man1
install -m 644 %{SOURCE102} %{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 <<EOF
#! /bin/sh
echo 'Please use "scanimage" from the "sane-backends" package instead.' >&2
exit 1
EOF
chmod a+x %{buildroot}%{_bindir}/hp-scan
%endif
# Run fdupes: # Run fdupes:
# The RPM macro fdupes runs /usr/bin/fdupes that links files with identical content. # The RPM macro fdupes runs /usr/bin/fdupes that links files with identical content.
# Never run fdupes carelessly over the whole buildroot directory # Never run fdupes carelessly over the whole buildroot directory