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
This commit is contained in:
Johannes Meixner 2014-09-18 09:58:46 +00:00 committed by Git OBS Bridge
parent b501904d86
commit 836a684ab2
2 changed files with 34 additions and 8 deletions

View File

@ -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 Mon Sep 15 11:43:09 CEST 2014 - jsmeix@suse.de

View File

@ -23,10 +23,22 @@ BuildRequires: dbus-1-devel
BuildRequires: fdupes BuildRequires: fdupes
# BuildRequires foomatic-filters (also provided by cups-filters-foomatic-rip) # BuildRequires foomatic-filters (also provided by cups-filters-foomatic-rip)
# to avoid /usr/lib/rpm/brp-symlink ERROR: # to avoid /usr/lib/rpm/brp-symlink ERROR:
# link target doesn't exist (neither in build root nor in installed system): # 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/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) # /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 BuildRequires: foomatic-filters
%endif
BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme
BuildRequires: libdrm-devel BuildRequires: libdrm-devel
BuildRequires: libgphoto2-devel BuildRequires: libgphoto2-devel
@ -539,10 +551,9 @@ popd
# 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 foomatic-filters or cups-filters-foomatic-rip 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
# for existing print queues a compatibility link # a compatibility link /usr/lib/cups/filter/foomatic-rip-hplip is installed
# /usr/lib/cups/filter/foomatic-rip-hplip # which points to the actual foomatic-rip executable.
# which points to foomatic-rip is installed.
# In foomatic-filters foomatic-rip is installed as /usr/bin/foomatic-rip but # 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: # in cups-filters-foomatic-rip it is installed as /usr/lib/cups/filter/foomatic-rip:
if test -e /usr/lib/cups/filter/foomatic-rip if test -e /usr/lib/cups/filter/foomatic-rip