Accepting request 146146 from home:jsmeix:branches:Printing
BuildRequires poppler-tools fixes bnc#776080 OBS-URL: https://build.opensuse.org/request/show/146146 OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=252
This commit is contained in:
Johannes Meixner
Git OBS Bridge
parent
830bb923e3
commit
4879e1f57e
16
cups.changes
16
cups.changes
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 20 12:38:47 CET 2012 - jsmeix@suse.de
|
||||
|
||||
- Added "BuildRequires: poppler-tools" which installs
|
||||
/usr/bin/pdftops for the build-time check in cups-pdf.m4
|
||||
regarding HAVE_PDFTOPS_WITH_ORIGPAGESIZE that makes sure
|
||||
that the CUPS filter /usr/lib/cups/filter/pdftops calls
|
||||
/usr/bin/pdftops with "-origpagesizes" otherwise it would
|
||||
result wrong PostScript output for poppler > 0.18.0 (bnc#776080)
|
||||
see also https://www.cups.org/str.php?L3689 (STR #3689).
|
||||
- Changed 'configure --with-pdftops=/usr/bin/pdftops' back to
|
||||
the upstream default 'configure --with-pdftops=pdftops'
|
||||
(compare the entry dated 'Fri Jul 31 15:08:41 CEST 2009').
|
||||
- Removed leftover and since a longer time obsolete
|
||||
"BuildRequires: avahi-compat-mDNSResponder-devel".
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 13 13:54:02 UTC 2012 - fcrozat@suse.com
|
||||
|
||||
|
||||
47
cups.spec
47
cups.spec
@ -15,9 +15,7 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: cups
|
||||
BuildRequires: avahi-compat-mDNSResponder-devel
|
||||
BuildRequires: dbus-1-devel
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
@ -25,22 +23,32 @@ BuildRequires: krb5-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libtiff-devel
|
||||
# Have libtool as explicit buildrequirement to no longer depend
|
||||
# on a "hidden" buildrequirement in the OBS project definition:
|
||||
BuildRequires: libtool
|
||||
BuildRequires: openldap2-devel
|
||||
BuildRequires: openslp-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: tcpd-devel
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: zlib-devel
|
||||
# Have libtool as explicit buildrequirement to no longer depend
|
||||
# on a "hidden" buildrequirement in the OBS project definition:
|
||||
BuildRequires: libtool
|
||||
%if 0%{?suse_version} > 1140
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
%{?systemd_requires}
|
||||
%define have_systemd 1
|
||||
%endif
|
||||
# The "BuildRequires: poppler-tools" installs /usr/bin/pdftops for the
|
||||
# check in config-scripts/cups-pdf.m4 regarding HAVE_PDFTOPS_WITH_ORIGPAGESIZE
|
||||
# see https://www.cups.org/str.php?L3689
|
||||
# If the installed /usr/bin/pdftops in the build system is new enough
|
||||
# to support the "-origpagesizes" option it results that the CUPS filter
|
||||
# /usr/lib/cups/filter/pdftops is built so that it uses "-origpagesizes"
|
||||
# when calling /usr/bin/pdftops otherwise it falls back to not use "-origpagesizes"
|
||||
# but those fallback would result wrong PostScript output since poppler > 0.18.0
|
||||
# see https://bugzilla.novell.com/show_bug.cgi?id=776080
|
||||
BuildRequires: poppler-tools
|
||||
BuildRequires: tcpd-devel
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: zlib-devel
|
||||
PreReq: %insserv_prereq
|
||||
PreReq: %fillup_prereq
|
||||
# sysvinit(syslog) is first provided in openSUSE:Factory (i.e. openSUSE 11.4):
|
||||
@ -70,8 +78,10 @@ Source0: cups-%{version}-source.tar.bz2
|
||||
# on the same package repository where the cups package is because
|
||||
# all are built simulaneously from the same cups source package
|
||||
# and all required packages are provided on the same repository:
|
||||
Requires: cups-client = %{version}
|
||||
Requires: cups-libs = %{version}-%{release}
|
||||
# Strictly speaking the cupsd in the package cups could run without the client tools
|
||||
# but this would be a too crippled use case so that a strict RPM Requires is justified:
|
||||
Requires: cups-client = %{version}
|
||||
# Inherited RPM Requires from the past but I (jsmeix@suse.de) do not know the reason for it:
|
||||
Requires: util-linux
|
||||
# The Ghostscript device "cups" is needed by several CUPS filters
|
||||
@ -81,12 +91,14 @@ Requires: util-linux
|
||||
# and cups-libs is a sub-package of cups so that there is an implicit build dependency
|
||||
# cycle between the main-packages cups and ghostscript.
|
||||
# Furthermore Ghostscript is not needed on a system where those CUPS filters are not used
|
||||
# (e.g. on a print server with only "raw" queues) so that a weak Recommends fits better:
|
||||
# (e.g. on client systems in the network where the filtering hapens on a CUPS server
|
||||
# or on a CUPS server with only "raw" queues) so that a weak Recommends fits better:
|
||||
Recommends: ghostscript
|
||||
# The CUPS filter /usr/lib/cups/filter/pdftops is a wrapper which calls /usr/bin/pdftops
|
||||
# (see the configure setting '--with-pdftops=/usr/bin/pdftops') so that this
|
||||
# (see the configure setting '--with-pdftops=pdftops') so that this
|
||||
# might justify a RPM Requires but this CUPS filter is not used on all systems
|
||||
# (e.g. on a print server with only "raw" queues) so that a weak Recommends is sufficient:
|
||||
# (e.g. on client systems in the network where the filtering hapens on a CUPS server
|
||||
# or on a CUPS server with only "raw" queues) so that a weak Recommends is sufficient:
|
||||
Recommends: /usr/bin/pdftops
|
||||
# Our Source105 PSLEVEL1.PPD.bz2 and Source106 PSLEVEL2.PPD.bz2 need foomatic-rip
|
||||
# but this does not justify a RPM Requires so that a weak Recommends is sufficient:
|
||||
@ -316,7 +328,7 @@ export CXX=g++
|
||||
--with-php \
|
||||
--with-python \
|
||||
--with-cachedir=/var/cache/cups \
|
||||
--with-pdftops=/usr/bin/pdftops \
|
||||
--with-pdftops=pdftops \
|
||||
%if 0%{?have_systemd}
|
||||
--with-systemdsystemunitdir=%{_unitdir} \
|
||||
%endif
|
||||
@ -436,13 +448,8 @@ exit 0
|
||||
# In particular all executables are listed explicitly.
|
||||
# This avoids that CUPS' configure magic might silently
|
||||
# not build and install an executable when whatever condition
|
||||
# for configure's automated tests is not fulfilled in the build system.
|
||||
# See https://bugzilla.novell.com/show_bug.cgi?id=526847#c9
|
||||
# (In CUPS 1.3.10 a configure magic did silently skip to build
|
||||
# the pdftops filter when there was no /usr/bin/pdftops
|
||||
# installed in the build system regardless of an explicite
|
||||
# configure setting '--with-pdftops=/usr/bin/pdftops',
|
||||
# see also http://www.cups.org/str.php?L3278).
|
||||
# for configure's automated tests is not fulfilled in the build system,
|
||||
# for example see https://bugzilla.novell.com/show_bug.cgi?id=526847#c9
|
||||
# When all mandatory files are explicitly listed,
|
||||
# the build fails intentionally if a mandatory file was not built
|
||||
# which ensures that already existing correctly built binary RPMs
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user