pool/cups
SHA256
12
0
Fork 2
Code Issues Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cups?expand=0&rev=62

Browse Source
This commit is contained in:
OBS User unknown
2009-07-31 17:04:46 +00:00
committed by Git OBS Bridge
parent c01b1e3b74
commit fdb8cc5689
3 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cups.changes
View File

@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Jul 31 15:08:41 CEST 2009 - jsmeix@suse.de
- full_path_to_configure_with-pdftops.patch
adds support to specify a full path in
'configure --with-pdftops=/usr/bin/pdftops'
to avoid 'BuildRequires: xpdf-tools' which would
bloat the build system but would be only needed to
satisfy 'AC_PATH_PROG(CUPS_PDFTOPS, pdftops)'
in cups-pdf.m4 if only 'configure --with-pdftops=pdftops'
was possible (Novell/Suse Bugzilla bnc#526847).
-------------------------------------------------------------------
Tue Jul 28 10:08:12 CEST 2009 - jsmeix@suse.de

17
cups.spec
View File

@@ -30,7 +30,7 @@ License: GPL v2 or later
Group: Hardware/Printing
Summary: The Common UNIX Printing System
Version: 1.3.11
Release: 1
Release: 2
Requires: cups-libs = %{version}, cups-client = %{version}
Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters
Requires: util-linux /usr/bin/pdftops
@@ -105,6 +105,12 @@ Patch22: cups-1.3.7-additional_policies.patch
# since CUPS 1.3.10 because it is fixed in the source.
# Patch28 cups-1.3.10-fix-DNS-rebinding-protection.patch is obsolete
# since CUPS 1.3.11 because it is fixed in the source.
# Patch29 full_path_to_configure_with-pdftops.patch adds support
# to specify a full path in 'configure --with-pdftops=/usr/bin/pdftops'
# to avoid 'BuildRequires: xpdf-tools' which would bloat the build system
# but would be only needed to satisfy 'AC_PATH_PROG(CUPS_PDFTOPS, pdftops)'
# in cups-pdf.m4 if only 'configure --with-pdftops=pdftops' was possible:
Patch29: full_path_to_configure_with-pdftops.patch
# Patch100 cups-1.1.23-testpage.patch is finally removed
# since CUPS 1.3.10 because it was made for CUPS 1.1 and
# it was no longer applied since CUPS 1.2 in Suse Linux 10.3 and
@@ -212,6 +218,9 @@ Authors:
%patch20 -p1
%patch21 -p1
%patch22 -p1
# Patch29 full_path_to_configure_with-pdftops.patch adds support
# for 'configure --with-pdftops=/usr/bin/pdftops':
%patch29
if [ -f /.buildenv ]; then
. /.buildenv
test -z "$BUILD_DISTRIBUTION_NAME" && BUILD_DISTRIBUTION_NAME="%{?distribution}"
@@ -231,6 +240,12 @@ cp -a %{SOURCE10} .
# So we disable it here, if you want to retest, delete this comment
# and the 'export SUSE_ASNEEDED=0' line:
export SUSE_ASNEEDED=0
# To build the /usr/lib/cups/filter/pdftops filter
# (via the configure options --enable-pdftops, --with-pdftops=pdftops)
# the config-scripts/cups-pdf.m4 tests if there is a pdftops executable in its path
# which could be satisfied with 'BuildRequires: xpdf-tools' which would bloat the build system
# so that we fake a pdftops executable with the following link:
ln -s /bin/true pdftops
%{?suse_update_config:%{suse_update_config -f . }}
libtoolize --force
aclocal

15
full_path_to_configure_with-pdftops.patch Normal file
View File

@@ -0,0 +1,15 @@
--- config-scripts/cups-pdf.m4.orig 2009-07-31 14:39:16.000000000 +0200
+++ config-scripts/cups-pdf.m4 2009-07-31 15:04:18.000000000 +0200
@@ -62,6 +62,12 @@ case "x$with_pdftops" in
exit 1
fi
;;
+
+ *) # Use exactly the /path/to/program which is specified
+ CUPS_PDFTOPS="$with_pdftops"
+ AC_DEFINE(HAVE_PDFTOPS)
+ PDFTOPS="pdftops"
+ ;;
esac
AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS")