Hello community,
here is the log from the commit of package cups
checked in at Wed Apr 9 21:07:37 CEST 2008.
--------
--- cups/cups.changes 2008-04-08 20:47:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/cups/cups.changes 2008-04-09 19:39:07.988155000 +0200
@@ -1,0 +2,13 @@
+Wed Apr 9 19:38:27 CEST 2008 - kssingvo@suse.de
+
+- pdftops uses now system command e.g. xpdf-tools (as in cups-1.4svn)
+- due to requests: client.conf is back in /etc/cups
+
+-------------------------------------------------------------------
+Wed Apr 9 12:30:55 CEST 2008 - kssingvo@suse.de
+
+- fix for buildsystem: added wrapper script for krb5-config as the
+ original output shows $CFLAGS $LIBDIR of cups.spec and rpath flags
+ (bugzilla#378270)
+
+-------------------------------------------------------------------
New:
----
cups-1.4svn-pdftops_as_filter.patch
cups-1.4svn-pdftops.c
cups-1.4svn-pdftops_wait_eintr.patch
cups-client.conf
cups-krb5-config
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cups.spec ++++++
--- /var/tmp/diff_new_pack.WI4432/_old 2008-04-09 21:06:40.000000000 +0200
+++ /var/tmp/diff_new_pack.WI4432/_new 2008-04-09 21:06:40.000000000 +0200
@@ -22,7 +22,7 @@
Group: Hardware/Printing
Summary: The Common UNIX Printing System
Version: 1.3.7
-Release: 3
+Release: 4
Requires: cups-libs = %{version}, cups-client = %{version}
Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters
Requires: util-linux
@@ -45,6 +45,9 @@
Source17: cups.SuSEfirewall2
Source18: http://download.sourceforge.net/cups-mailto/cups-pdf.ppd
Source19: http://download.sourceforge.net/cups-mailto/cups-pstopdf
+Source20: cups-krb5-config
+Source21: cups-client.conf
+Source22: cups-1.4svn-pdftops.c
Patch1: cups-1.3.3-mime.patch
Patch2: cups-1.2.0-ppdsdat_generation.patch
Patch3: cups-1.2rc1-template.patch
@@ -59,8 +62,18 @@
Patch15: cups-1.2.11-testppd_filename.patch
Patch16: cups-1.2.5-desktop_file.patch
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
Patch100: cups-1.1.23-testpage.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1030
+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
@@ -121,7 +134,7 @@
License: GPL v2 or later
Summary: Development Environment for CUPS
Group: Development/Libraries/C and C++
-Requires: %{name}-libs = %{version} openssl-devel glibc-devel
+Requires: %{name}-libs = %{version} openssl-devel glibc-devel krb5-devel
%description devel
The Common UNIX Printing System provides a portable printing layer for
@@ -138,6 +151,9 @@
%prep
%setup -n %{name}-%{version}
+%{INSTALL_DATA} %{SOURCE22} filter/pdftops.c
+# just to make avoid misunderstandings...
+mv pdftops pdftos.use_filter_pdftops_c
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -152,6 +168,8 @@
%patch15 -p1
%patch16 -p1
%patch17 -p1
+%patch18 -p1
+%patch19 -p1
if [ -f /.buildenv ]; then
. /.buildenv
else
@@ -165,6 +183,7 @@
config-scripts/cups-directories.m4
cp -a %{SOURCE9} .
cp -a %{SOURCE10} .
+%{INSTALL_SCRIPT} %{SOURCE20} krb5-config
%build
%{?suse_update_config:%{suse_update_config -f . }}
@@ -179,7 +198,7 @@
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%endif
export CXX=g++
-./configure \
+KRB5CONFIG=${PWD}/krb5-config ./configure \
--mandir=%{_mandir} \
--sysconfdir=%{_sysconfdir} \
--libdir=%{_libdir} \
@@ -239,6 +258,8 @@
ln -sf /usr/share/ghostscript/fonts $RPM_BUILD_ROOT/usr/share/cups/
# make directory for ssl files:
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl
+# add old client.conf as reference:
+%{INSTALL_DATA} %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/cups/client.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
install -m 644 -D packaging/cups-dbus.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/cups.conf
install -m 644 -D %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/cups-lpd
@@ -396,13 +417,20 @@
%dir %attr(0710,root,lp) %{_var}/spool/cups
%dir %attr(1770,root,lp) %{_var}/spool/cups/tmp
%dir %attr(0755,lp,lp) %{_var}/log/cups/
-# %config(noreplace) %{_sysconfdir}/cups/client.conf
+%config(noreplace) %{_sysconfdir}/cups/client.conf
%config(noreplace) /etc/sysconfig/SuSEfirewall2.d/services/cups
%{_libdir}/libcups.so.*
%{_libdir}/libcupsimage.so.*
%{_datadir}/locale/*/cups_*
%changelog
+* Wed Apr 09 2008 kssingvo@suse.de
+- pdftops uses now system command e.g. xpdf-tools (as in cups-1.4svn)
+- due to requests: client.conf is back in /etc/cups
+* Wed Apr 09 2008 kssingvo@suse.de
+- fix for buildsystem: added wrapper script for krb5-config as the
+ original output shows $CFLAGS $LIBDIR of cups.spec and rpath flags
+ (bugzilla#378270)
* Tue Apr 08 2008 kssingvo@suse.de
- added missing directory /var/cache/cups to %%files
- added pstopdf filter (from cups-mailto project at sourceforge.net)
++++++ cups-1.4svn-pdftops_as_filter.patch ++++++
--- ./test/run-stp-tests.sh.orig 2008-04-01 23:30:44.000000000 +0200
+++ ./test/run-stp-tests.sh 2008-04-09 18:05:52.000000000 +0200
@@ -273,7 +273,7 @@
else
ln -s $root/filter/imagetops /tmp/cups-$user/bin/filter
ln -s $root/filter/imagetoraster /tmp/cups-$user/bin/filter
- ln -s $root/pdftops/pdftops /tmp/cups-$user/bin/filter
+ ln -s $root/filter/pdftops /tmp/cups-$user/bin/filter
fi
#
--- ./packaging/cups.list.in.orig 2008-02-15 22:32:52.000000000 +0100
+++ ./packaging/cups.list.in 2008-04-09 18:06:28.000000000 +0200
@@ -265,7 +265,7 @@
f 0755 root sys $SERVERBIN/filter/imagetoraster filter/imagetoraster
%endif
%if PDFTOPS
-f 0755 root sys $SERVERBIN/filter/pdftops pdftops/pdftops
+f 0755 root sys $SERVERBIN/filter/pdftops filter/pdftops
%endif
f 0755 root sys $SERVERBIN/filter/pstops filter/pstops
f 0755 root sys $SERVERBIN/filter/rastertolabel filter/rastertolabel
--- ./filter/Makefile.orig 2007-07-20 01:27:49.000000000 +0200
+++ ./filter/Makefile 2008-04-09 18:05:26.000000000 +0200
@@ -19,7 +19,7 @@
FILTERS = gziptoany hpgltops texttops pstops $(IMGFILTERS) \
- rastertolabel rastertoepson rastertohp
+ rastertolabel rastertoepson rastertohp pdftops
TARGETS = $(FILTERS) \
$(LIBCUPSIMAGE) \
libcupsimage.a \
@@ -41,7 +41,7 @@
OBJS = $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) \
gziptoany.o imagetops.o imagetoraster.o common.o pstops.o \
rasterbench.o rastertoepson.o rastertohp.o rastertolabel.o \
- testimage.o testraster.o textcommon.o texttops.o
+ testimage.o testraster.o textcommon.o texttops.o pdftops.o
#
@@ -322,6 +322,14 @@
echo Linking $@...
$(CC) $(LDFLAGS) -o $@ pstops.o common.o $(LIBS) -lm
+#
+# pdftops
+#
+
+pdftops: pdftops.o common.o ../cups/$(LIBCUPS)
+ echo Linking $@...
+ $(CC) $(LDFLAGS) -o $@ pdftops.o common.o $(LIBS)
+
#
# rastertolabel
--- cups-1.3.7/config-scripts/cups-pdf.m4.orig 2007-07-11 23:46:42.000000000 +0200
+++ cups-1.3.7/config-scripts/cups-pdf.m4 2008-04-09 18:21:35.000000000 +0200
@@ -18,12 +18,20 @@
PDFTOPS=""
if test "x$enable_pdftops" != xno; then
- AC_MSG_CHECKING(whether to build pdftops filter)
- if test "x$enable_pdftops" = xyes -o $uname != Darwin; then
- PDFTOPS="pdftops"
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
+ 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
+ PDFTOPS="pdftops"
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+ elif test x$enable_pdftops = xyes; then
+ AC_MSG_ERROR(Unable to find pdftops program!)
+ exit 1
fi
fi
--- cups-1.3.7/config.h.in.orig 2008-01-07 19:26:57.000000000 +0100
+++ cups-1.3.7/config.h.in 2008-04-09 18:22:50.000000000 +0200
@@ -420,6 +420,12 @@
#undef HAVE_PYTHON
#define CUPS_PYTHON "/usr/bin/python"
+/*
+ * Location of the poppler/Xpdf pdftops program...
+ */
+
+#define CUPS_PDFTOPS "/usr/bin/pdftops"
+
/*
* Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?
--- cups-1.3.7/filter/pdftops.c.orig 2008-04-09 18:23:35.000000000 +0200
+++ cups-1.3.7/filter/pdftops.c 2008-04-09 18:33:53.000000000 +0200
@@ -115,7 +115,7 @@
if ((fd = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
{
- _cupsLangPrintError(_("ERROR: Unable to copy PDF file"));
+ perror(_("ERROR: Unable to copy PDF file"));
return (1);
}
@@ -245,7 +245,7 @@
*/
execv(CUPS_PDFTOPS, pdfargv);
- _cupsLangPrintError(_("ERROR: Unable to execute pdftops filter"));
+ perror(_("ERROR: Unable to execute pdftops filter"));
exit(1);
}
else if (pdfpid < 0)
@@ -254,7 +254,7 @@
* Unable to fork!
*/
- _cupsLangPrintError(_("ERROR: Unable to execute pdftops filter"));
+ perror(_("ERROR: Unable to execute pdftops filter"));
pdfstatus = 1;
}
else
--- cups-1.3.7/Makefile.orig 2008-02-16 00:26:51.000000000 +0100
+++ cups-1.3.7/Makefile 2008-04-09 19:08:39.000000000 +0200
@@ -20,7 +20,7 @@
#
DIRS = cups backend berkeley cgi-bin filter locale man monitor \
- notifier $(PDFTOPS) scheduler systemv test \
+ notifier scheduler systemv test \
$(PHPDIR) \
conf data doc $(FONTS) ppd templates
++++++ cups-1.4svn-pdftops_wait_eintr.patch ++++++
#! /bin/sh /usr/share/dpatch/dpatch-run
## pdftops-wait-eintr.dpatch by