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

cups-hardcode_pdftops.patch

@@ -0,0 +1,38 @@
+--- config-scripts/cups-pdf.m4
++++ config-scripts/cups-pdf.m4
+@@ -13,26 +13,31 @@
+ dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+ dnl
+ 
+-AC_ARG_ENABLE(pdftops, [  --enable-pdftops        build pdftops filter, default=auto ])
++AC_ARG_WITH(pdftops, [  --with-pdftops        build pdftops filter, default=auto ],[],with_pdftops=auto)
+ 
+ PDFTOPS=""
+ 
+-if test "x$enable_pdftops" != xno; then
++if test "x$with_pdftops" != xno; then
++    if test "x$with_pdftops" != xyes -a "x$with_pdftops" != xauto ; then
++	CUPS_PDFTOPS=$with_pdftops
++	AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS")
++    else
+ 	AC_PATH_PROG(CUPS_PDFTOPS, pdftops)
+ 	AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS")
+ 
+ 	if test "x$CUPS_PDFTOPS" != x; then
+ 		AC_MSG_CHECKING(whether to build pdftops filter)
+-		if test "x$enable_pdftops" = xyes -o $uname != Darwin; then
++		if test "x$with_pdftops" = xyes -o $uname != Darwin; then
+ 			PDFTOPS="pdftops"
+ 			AC_MSG_RESULT(yes)
+ 		else
+ 			AC_MSG_RESULT(no)
+ 		fi
+-	elif test x$enable_pdftops = xyes; then
++	elif test x$with_pdftops = xyes; then
+ 		AC_MSG_ERROR(Unable to find pdftops program!)
+ 		exit 1
+ 	fi
++    fi
+ fi
+ 
+ AC_SUBST(PDFTOPS)

cups.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr 11 11:06:33 CEST 2008 - ro@suse.de
+
+- explicitly specify pdftops binary for configure to avoid
+  adding buildrequires just for a binary path 
+
 -------------------------------------------------------------------
 Thu Apr 10 20:38:26 CEST 2008 - coolo@suse.de
 

cups.spec

@@ -22,7 +22,7 @@ License:        GPL v2 or later
 Group:          Hardware/Printing
 Summary:        The Common UNIX Printing System
 Version:        1.3.7
-Release:        7
+Release:        8
 Requires:       cups-libs = %{version}, cups-client = %{version}
 Requires:       ghostscript_any, ghostscript-fonts-std, foomatic-filters
 Requires:       util-linux
@@ -65,15 +65,9 @@ Patch17:        cups-1.3.3-testppd_none.patch
 Patch18:        cups-1.4svn-pdftops_as_filter.patch
 # next is found as http://www.cups.org/strfiles/2780/pdftops-wait-eintr.dpatch
 Patch19:        cups-1.4svn-pdftops_wait_eintr.patch
+Patch20:        cups-hardcode_pdftops.patch
 Patch100:       cups-1.1.23-testpage.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} > 1130
-Requires:       poppler-tools
-BuildRequires:  poppler-tools
-%else
-Requires:       xpdf-tools
-BuildRequires:  xpdf-tools
-%endif
 
 %description
 The Common UNIX Printing System provides a portable printing layer for
@@ -170,6 +164,7 @@ mv pdftops pdftos.use_filter_pdftops_c
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20
 if [ -f /.buildenv ]; then
 	. /.buildenv
 else
@@ -218,6 +213,7 @@ KRB5CONFIG=${PWD}/krb5-config ./configure \
 	--with-python \
 	--with-python \
 	--with-cachedir \
+	--with-pdftops=/usr/bin/pdftops \
 	--prefix=/
 # perl -pi -e 's:^(OPTIONS\s+\=):$1 -I/usr/X11R6/include -O2 -fstack-protector -fno-strict-aliasing:' Makedefs
 # perl -pi -e 's:^(INSTALL_BIN\s+\=.*)-s:$1:' Makedefs
@@ -424,6 +420,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/locale/no
 %{_datadir}/locale/*/cups_*
 
 %changelog
+* Fri Apr 11 2008 ro@suse.de
+- explicitly specify pdftops binary for configure to avoid
+  adding buildrequires just for a binary path
 * Thu Apr 10 2008 coolo@suse.de
 - take out poppler for now to break the cycle, Klaus will
   fix correctly later