From b501904d8672db734fc01c6cf959dda5507e764fabbc76d9dcd743ba43fc86de Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Mon, 15 Sep 2014 12:47:22 +0000 Subject: [PATCH 1/2] Accepting request 249259 from home:jsmeix:branches:Printing - 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). OBS-URL: https://build.opensuse.org/request/show/249259 OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=98 --- hplip.changes | 11 +++++++++++ hplip.spec | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/hplip.changes b/hplip.changes index 578112b..924723d 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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 diff --git a/hplip.spec b/hplip.spec index 66056c3..a64eaec 100644 --- a/hplip.spec +++ b/hplip.spec @@ -515,6 +515,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 @@ -685,6 +700,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/ From 836a684ab2a66f16199c327a058474a523898c89cddcbedb1c16772f7fa77512 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Thu, 18 Sep 2014 09:58:46 +0000 Subject: [PATCH 2/2] Accepting request 250076 from home:jsmeix:branches:Printing - 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. OBS-URL: https://build.opensuse.org/request/show/250076 OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=99 --- hplip.changes | 15 +++++++++++++++ hplip.spec | 27 +++++++++++++++++++-------- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/hplip.changes b/hplip.changes index 924723d..f1f8bb2 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +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 diff --git a/hplip.spec b/hplip.spec index a64eaec..d650bc2 100644 --- a/hplip.spec +++ b/hplip.spec @@ -23,10 +23,22 @@ BuildRequires: dbus-1-devel 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) +# 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 @@ -138,7 +150,7 @@ Requires: %{name}-sane = %{version}-%{release} # 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 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 # (see the comment for the hplip-hpijs sub-package below). # Therefore the hplip main package which is intended @@ -539,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