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

Accepting request 231130 from home:jsmeix:branches:Printing

Browse Source 
Fix how the link that points to foomatic-rip is installed depending on which package provides foomatic-rip. This should fix building hplip on openSUSE:Factory where it currently fails to build because that link is currently created wrong on openSUSE:Factory.

OBS-URL: https://build.opensuse.org/request/show/231130
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=92
This commit is contained in:
Johannes Meixner 2014-04-23 09:49:41 +00:00 committed by Git OBS Bridge
parent 4f089b03f3
commit ab1434b063
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hplip.changes
View File

@ -1,7 +1,17 @@
-------------------------------------------------------------------
Wed Apr 23 10:26:50 CEST 2014 - jsmeix@suse.de
- Fix how the link /usr/lib/cups/filter/foomatic-rip-hplip
that points to foomatic-rip is installed depending on
which package provides foomatic-rip. 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.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Apr 20 09:48:39 UTC 2014 - tchvatal@suse.com Sun Apr 20 09:48:39 UTC 2014 - tchvatal@suse.com
- Enable paralel build. - Enable parallel build via "make %{?_smp_mflags}".
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 9 16:02:02 CEST 2014 - jsmeix@suse.de Wed Apr 9 16:02:02 CEST 2014 - jsmeix@suse.de

34
hplip.spec
View File

@ -15,15 +15,16 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
Name: hplip Name: hplip
# BuildRequires foomatic-filters to avoid /usr/lib/rpm/brp-symlink ERROR:
# link target doesn't exist (neither in build root nor in installed system):
# /usr/lib/cups/filter/foomatic-rip-hplip -> /usr/bin/foomatic-rip
BuildRequires: cups BuildRequires: cups
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: dbus-1-devel BuildRequires: dbus-1-devel
BuildRequires: fdupes BuildRequires: fdupes
# BuildRequires foomatic-filters (also provided by cups-filters-foomatic-rip)
# to avoid /usr/lib/rpm/brp-symlink ERROR:
# 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)
BuildRequires: foomatic-filters BuildRequires: foomatic-filters
BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme
BuildRequires: libdrm-devel BuildRequires: libdrm-devel
@ -135,14 +136,15 @@ Requires: %{name}-sane = %{version}-%{release}
# Because foomatic-rip-hplip has CVE-2011-2697 (bnc#698451) # Because foomatic-rip-hplip has CVE-2011-2697 (bnc#698451)
# plus a leftover in CVE-2004-0801 (bnc#59233) # plus a leftover in CVE-2004-0801 (bnc#59233)
# foomatic-rip-hplip is no longer installed and foomatic-rip # foomatic-rip-hplip is no longer installed and foomatic-rip
# from the foomatic-filters RPM is used instead. # from foomatic-filters or cups-filters-foomatic-rip is used instead.
# The RPM requirement for foomatic-filters should actually be # The RPM requirement for foomatic-filters should actually be
# in the hplip-hpijs sub-package but this would bloat a minimalist system # in the hplip-hpijs sub-package but this would bloat a minimalist system
# (see the comment for the hplip-hpijs sub-package below). # (see the comment for the hplip-hpijs sub-package below).
# 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: foomatic-filters Requires: foomatic-filters
# foomatic-filters does not require Ghostscript because depending on the PPD # foomatic-filters and cups-filters-foomatic-rip
# do not require Ghostscript because depending on the PPD
# (e.g. some PPDs for PostScript printers in OpenPrintingPPDs-postscript) # (e.g. some PPDs for PostScript printers in OpenPrintingPPDs-postscript)
# foomatic-rip can also be used without Ghostscript but for the drivers # foomatic-rip can also be used without Ghostscript but for the drivers
# HPIJS and HPCUPS Ghostscript is needed. # HPIJS and HPCUPS Ghostscript is needed.
@ -380,7 +382,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
# --enable-foomatic-rip-hplip-install enable foomatic-rip-hplip install (default=no), uses cupsfilterdir # --enable-foomatic-rip-hplip-install enable foomatic-rip-hplip install (default=no), uses cupsfilterdir
# Because foomatic-rip-hplip has CVE-2011-2697 (bnc#698451) plus a leftover in CVE-2004-0801 (bnc#59233) # Because foomatic-rip-hplip has CVE-2011-2697 (bnc#698451) plus a leftover in CVE-2004-0801 (bnc#59233)
# which are fixed up to openSUSE 11.4 with patches, after openSUSE 11.4 (i.e. since openSUSE 12.1) # which are fixed up to openSUSE 11.4 with patches, after openSUSE 11.4 (i.e. since openSUSE 12.1)
# foomatic-rip-hplip is no longer installed and foomatic-rip from foomatic-filters is used instead so that # foomatic-rip-hplip is no longer installed and foomatic-rip from
# foomatic-filters or cups-filters-foomatic-rip is used instead so that
# --disable-foomatic-rip-hplip-install is explicitly set and as a consequence the "cupsFilter" entries # --disable-foomatic-rip-hplip-install is explicitly set and as a consequence the "cupsFilter" entries
# in the static PPDs are changed in the install section to use foomatic-rip. # in the static PPDs are changed in the install section to use foomatic-rip.
# Since HPLIP 3.13.10 --with-htmldir is new but it does not inhertit its value from --with-docdir # Since HPLIP 3.13.10 --with-htmldir is new but it does not inhertit its value from --with-docdir
@ -462,8 +465,8 @@ for p in *.ppd
do echo -en '\n' >>$p do echo -en '\n' >>$p
done done
# Because foomatic-rip-hplip has CVE-2011-2697 (bnc#698451) plus a leftover in CVE-2004-0801 (bnc#59233) # Because foomatic-rip-hplip has CVE-2011-2697 (bnc#698451) plus a leftover in CVE-2004-0801 (bnc#59233)
# foomatic-rip-hplip is no longer installed and foomatic-rip from foomatic-filters is used instead so that # foomatic-rip-hplip is no longer installed and foomatic-rip from foomatic-filters or cups-filters-foomatic-rip
# the "cupsFilter" entries in the static PPDs must be changed accordingly: # is used instead so that the "cupsFilter" entries in the static PPDs must be changed accordingly:
echo "Replacing insecure foomatic-rip-hplip with foomatic-rip everywhere in in the PPDs..." echo "Replacing insecure foomatic-rip-hplip with foomatic-rip everywhere in in the PPDs..."
for p in *.ppd for p in *.ppd
do sed -i -e 's/foomatic-rip-hplip/foomatic-rip/' $p do sed -i -e 's/foomatic-rip-hplip/foomatic-rip/' $p
@ -504,12 +507,19 @@ popd
# Because foomatic-rip-hplip has CVE-2011-2697 (bnc#698451) # Because foomatic-rip-hplip has CVE-2011-2697 (bnc#698451)
# plus a leftover in CVE-2004-0801 (bnc#59233) # plus a leftover in CVE-2004-0801 (bnc#59233)
# foomatic-rip-hplip is no longer installed and foomatic-rip # foomatic-rip-hplip is no longer installed and foomatic-rip
# from the foomatic-filters RPM must be used instead. # from foomatic-filters or cups-filters-foomatic-rip must be used instead.
# To be backward compatible with PPDs in /etc/cups/ppd/ # To be backward compatible with PPDs in /etc/cups/ppd/
# for existing print queues a compatibility link # for existing print queues a compatibility link
# /usr/lib/cups/filter/foomatic-rip-hplip # /usr/lib/cups/filter/foomatic-rip-hplip
# which points to foomatic-rip is installed: # which points to foomatic-rip is installed.
ln -s ../../../bin/foomatic-rip %{buildroot}/usr/lib/cups/filter/foomatic-rip-hplip # 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
then ln -s foomatic-rip %{buildroot}/usr/lib/cups/filter/foomatic-rip-hplip
else if test -e /usr/bin/foomatic-rip
then ln -s ../../../bin/foomatic-rip %{buildroot}/usr/lib/cups/filter/foomatic-rip-hplip
fi
fi
# Replace the invalid Desktop categories # Replace the invalid Desktop categories
%suse_update_desktop_file -r %{buildroot}%{_datadir}/applications/hplip.desktop System HardwareSettings %suse_update_desktop_file -r %{buildroot}%{_datadir}/applications/hplip.desktop System HardwareSettings
# Let suse_update_desktop_file add X-SuSE-translate key to /etc/xdg/autostart/hplip-systray.desktop # Let suse_update_desktop_file add X-SuSE-translate key to /etc/xdg/autostart/hplip-systray.desktop