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

Accepting request 250077 from Printing

Browse Source 
- From openSUSE 13.2 on explicitly
  "BuildRequires cups-filters-foomatic-rip"
  to avoid that foomatic-filters is used for build
  in the "Printing" development project (where foomatic-filters
  intentionally exists also for openSUSE_13.2 and openSUSE_Factory)
  which would not match what is used for build in openSUSE:13.2 or
  openSUSE:Factory (where foomatic-filters is intentionally dropped
  and replaced by cups-filters-foomatic-rip). Using the matching
  package for build results that the backward compatibility link
  /usr/lib/cups/filter/foomatic-rip-hplip points to a foomatic-rip
  executable that is used by default on the runtime system. (forwarded request 250076 from jsmeix)

OBS-URL: https://build.opensuse.org/request/show/250077
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hplip?expand=0&rev=96
This commit is contained in:
Stephan Kulow 2014-09-19 11:55:52 +00:00 committed by Git OBS Bridge
commit 995cf0a36a
2 changed files with 61 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hplip.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Thu Sep 18 10:31:14 CEST 2014 - jsmeix@suse.de
- From openSUSE 13.2 on explicitly
"BuildRequires cups-filters-foomatic-rip"
to avoid that foomatic-filters is used for build
in the "Printing" development project (where foomatic-filters
intentionally exists also for openSUSE_13.2 and openSUSE_Factory)
which would not match what is used for build in openSUSE:13.2 or
openSUSE:Factory (where foomatic-filters is intentionally dropped
and replaced by cups-filters-foomatic-rip). Using the matching
package for build results that the backward compatibility link
/usr/lib/cups/filter/foomatic-rip-hplip points to a foomatic-rip
executable that is used by default on the runtime system.
-------------------------------------------------------------------
Mon Sep 15 11:43:09 CEST 2014 - jsmeix@suse.de
- PPDs that require a proprietary plugin from HP must be moved to
the hplip main-package because the proprietary plugin from HP
must be downloaded and installed by using HP's "hp-plugin" tool
that belongs to the hplip main-package. Accordingly PPDs that
require a proprietary plugin from HP are in a new directory
/usr/share/cups/model/manufacturer-PPDs/hplip-plugin
that belongs to the hplip main-package (bnc#876690).
-------------------------------------------------------------------
Tue Jun 10 11:34:10 CEST 2014 - jsmeix@suse.de

35
hplip.spec
View File

@ -26,7 +26,19 @@ BuildRequires: fdupes
# link target doesn't exist (neither in build root nor in installed system):
# /usr/lib/cups/filter/foomatic-rip-hplip -> /usr/bin/foomatic-rip (for foomatic-filters) or
# /usr/lib/cups/filter/foomatic-rip-hplip -> /usr/lib/cups/filter/foomatic-rip (for cups-filters-foomatic-rip)
# From openSUSE 13.2 on explicitly "BuildRequires cups-filters-foomatic-rip"
# to avoid that foomatic-filters is used for build in the "Printing" development project
# (in "Printing" foomatic-filters exists intentionally also for openSUSE_13.2 and openSUSE_Factory)
# which would not match what is used for build in openSUSE:13.2 or openSUSE:Factory
# (in openSUSE:13.2 or openSUSE:Factory foomatic-filters is intentionally dropped).
# Using the matching package for build results that the backward compatibility link
# /usr/lib/cups/filter/foomatic-rip-hplip (see the install section below)
# points to a foomatic-rip executable that is used by default on the runtime system.
%if 0%{?suse_version} > 1310
BuildRequires: cups-filters-foomatic-rip
%else
BuildRequires: foomatic-filters
%endif
BuildRequires: hicolor-icon-theme
BuildRequires: libdrm-devel
BuildRequires: libgphoto2-devel
@ -515,6 +527,21 @@ install -d %{buildroot}%{_datadir}/cups/model/manufacturer-PPDs/%{name}-hpps
for p in *.ppd.gz
do zgrep -q '^\*cupsFilter:.*hpps' $p && mv $p ../%{name}-hpps
done
echo "Moving PPDs that require a proprietary plugin from HP to /usr/share/cups/model/manufacturer-PPDs/hplip-plugin..."
# PPDs for various printers that require a proprietary plugin from HP
# must be moved to the hplip main-package because
# the proprietary plugin from HP must be downloaded and installed
# by using HP's "hp-plugin" tool from the hplip main-package
# (HP's "hp-setup" tool calls "hp-plugin" when needed).
# Accordingly PPDs that require a proprietary plugin from HP must be moved
# to the hplip main-package which is implemented by moving them
# to a new directory /usr/share/cups/model/manufacturer-PPDs/hplip-plugin
# that is listed in the files list of the hplip main-package
# (see https://bugzilla.novell.com/show_bug.cgi?id=876690):
install -d %{buildroot}%{_datadir}/cups/model/manufacturer-PPDs/%{name}-plugin
for p in *.ppd.gz
do zgrep -q '^\*NickName:.*requires proprietary plugin' $p && mv $p ../%{name}-plugin
done
echo "End of general tests and adjustments for all PPDs."
# Switch back to the usual build log messages:
set -x
@ -524,10 +551,9 @@ popd
# plus a leftover in CVE-2004-0801 (bnc#59233)
# foomatic-rip-hplip is no longer installed and foomatic-rip
# from foomatic-filters or cups-filters-foomatic-rip must be used instead.
# To be backward compatible with PPDs in /etc/cups/ppd/
# for existing print queues a compatibility link
# /usr/lib/cups/filter/foomatic-rip-hplip
# which points to foomatic-rip is installed.
# To be backward compatible with PPDs in /etc/cups/ppd/ for existing print queues
# a compatibility link /usr/lib/cups/filter/foomatic-rip-hplip is installed
# which points to the actual foomatic-rip executable.
# In foomatic-filters foomatic-rip is installed as /usr/bin/foomatic-rip but
# in cups-filters-foomatic-rip it is installed as /usr/lib/cups/filter/foomatic-rip:
if test -e /usr/lib/cups/filter/foomatic-rip
@ -685,6 +711,7 @@ exit 0
%dir %{_datadir}/cups/model
%dir %{_datadir}/cups/model/manufacturer-PPDs
%{_datadir}/cups/model/manufacturer-PPDs/%{name}-hpps/
%{_datadir}/cups/model/manufacturer-PPDs/%{name}-plugin/
%doc %{_defaultdocdir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/hplip/