From 2fdecea380bf8b7ce84aa1d9594c3b7c5cbe31821167a3e2461e42f66bde59f9 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Wed, 7 Oct 2015 14:22:00 +0000 Subject: [PATCH] Accepting request 337010 from home:jsmeix:branches:Printing Dropped support for the outdated foomatic-rip-hplip which makes it "just build" again also if suse_version > 1310 without awkward hacks. OBS-URL: https://build.opensuse.org/request/show/337010 OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=120 --- hplip.changes | 14 +++++++++++++- hplip.spec | 38 -------------------------------------- 2 files changed, 13 insertions(+), 39 deletions(-) diff --git a/hplip.changes b/hplip.changes index 997b3bd..52ea774 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Oct 7 15:59:10 CEST 2015 - jsmeix@suse.de + +- Dropped support for the outdated foomatic-rip-hplip via + a symbolic link from /usr/lib/cups/filter/foomatic-rip-hplip + to /usr/bin/foomatic-rip for foomatic-filters or to + /usr/lib/cups/filter/foomatic-rip for cups-filters-foomatic-rip + so that "BuildRequires cups-filters-foomatic-rip" can be dropped + (cf. the entry dated "Thu Sep 18 10:31:14 CEST 2014" below) + which makes it "just build" again if suse_version > 1310 without + the need for more and more oversophisticated hacks. + ------------------------------------------------------------------- Tue Oct 6 14:20:10 CEST 2015 - jsmeix@suse.de @@ -21,7 +33,7 @@ Tue Oct 6 14:20:10 CEST 2015 - jsmeix@suse.de HP OfficeJet 4655 All-in-One Printer HP OfficeJet 6820 e-All-in-One Printer Some bug fixes - in particular: - Fixed hplip plugin failure with hplip-3.15.7. + Fixed hplip plugin failure with hplip-3.15.7. For details see http://hplipopensource.com/hplip-web/release_notes.html - Version upgrade to 3.15.7: diff --git a/hplip.spec b/hplip.spec index f463356..23b5f87 100644 --- a/hplip.spec +++ b/hplip.spec @@ -187,24 +187,6 @@ Provides: hplip3 = 3.9.5 Obsoletes: hplip3 < 3.9.5 # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build -# 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) -# 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 %description The Hewlett-Packard Linux Imaging and Printing project (HPLIP) provides @@ -381,9 +363,6 @@ export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags} -fno-strict-aliasing" # --disable-pp-build disables parallel port build because parallel port support is deprecated by upstream HPLIP # and by upstream in general cf. "Parallel port printers" at https://en.opensuse.org/SDB:Installing_a_Printer -# Static "hpijs" PPD files via enable-foomatic-ppd-install -# require foomatic-rip-hplip via their cupsFilter entries -# so that enable-foomatic-rip-hplip-install is also needed. # Since version 3.9.6 the default printer driver install changed from hpijs to hpcups. # According to http://hplipopensource.com/hplip-web/release_notes.html # all drv installs require CUPSDDK 1.2.3 or higher. @@ -398,7 +377,6 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing" # --enable-hpijs-install enable hpijs install (default=no) # --disable-foomatic-drv-install enable foomatic dynamic ppd install (default=no), uses drvdir and hpppddir # --enable-foomatic-ppd-install enable foomatic static ppd install (default=no), uses hpppddir -# --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) # 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 @@ -576,21 +554,6 @@ echo "End of general tests and adjustments for all PPDs." set -x # End of "General tests and adjustments for all PPDs": popd -# 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 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 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 %{_libexecdir}/cups/filter/foomatic-rip -then ln -s foomatic-rip %{buildroot}%{_libexecdir}/cups/filter/foomatic-rip-hplip -else if test -e %{_bindir}/foomatic-rip - then ln -s ../../../bin/foomatic-rip %{buildroot}%{_libexecdir}/cups/filter/foomatic-rip-hplip - fi -fi # Replace the invalid Desktop categories %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 @@ -752,7 +715,6 @@ exit 0 %dir %{_libexecdir}/cups/backend %{_libexecdir}/cups/backend/hp %dir %{_libexecdir}/cups/filter -%{_libexecdir}/cups/filter/foomatic-rip-hplip %{_libexecdir}/cups/filter/hpcups %{_libexecdir}/cups/filter/hpcupsfax %{_libexecdir}/cups/filter/pstotiff