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

2008-04-08 20:37:35 +00:00 · 2008-04-08 20:37:35 +00:00 · 7972500c88
commit 7972500c88
parent 132f08eae4
4 changed files with 238 additions and 4 deletions
--- a/cups-pdf.ppd
+++ b/cups-pdf.ppd
@ -0,0 +1,136 @@
+*PPD-Adobe: "4.3"
+*%
+*% "$Id: pdf.ppd,v 1.2 2003/01/02 15:47:37 gurubert Exp $"
+*%
+*%   Printer description for a printer that uses the pstopdf filter
+*%
+*%   This file is based on the laserjet.ppd that comes with CUPS.
+*%
+*FormatVersion:	"4.3"
+*FileVersion:	"1.1"
+*LanguageVersion: English 
+*LanguageEncoding: ISOLatin1
+*PCFileName:	"LASERJET.PPD"
+*Manufacturer:	"ESP"
+*Product:	"(CUPS v1.1)"
+*cupsVersion:	1.1
+*cupsManualCopies: False
+*cupsFilter:	"application/vnd.cups-postscript 33 pstopdf"
+*ModelName:     "PDF Converter"
+*ShortNickName: "PDF Converter"
+*NickName:      "PDF Converter CUPS v1.1"
+*PSVersion:	"(3010.000) 550"
+*LanguageLevel:	"3"
+*ColorDevice:	True
+*DefaultColorSpace: RGB
+*FileSystem:	False
+*Throughput:	"8"
+*LandscapeOrientation: Plus90
+*VariablePaperSize: False
+*TTRasterizer:  Type42
+
+*OpenUI *PageSize/Media Size: PickOne
+*OrderDependency: 10 AnySetup *PageSize
+*DefaultPageSize: A4
+*PageSize Letter/US Letter:	"<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*PageSize Legal/US Legal:	"<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+*PageSize Executive/US Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+*PageSize Tabloid/US Tabloid:	"<</PageSize[792 1224]/ImagingBBox null>>setpagedevice"
+*PageSize A3/A3:		"<</PageSize[842 1191]/ImagingBBox null>>setpagedevice"
+*PageSize A4/A4:		"<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
+*PageSize A5/A5:		"<</PageSize[421 595]/ImagingBBox null>>setpagedevice"
+*PageSize B5/B5 (JIS):		"<</PageSize[516 729]/ImagingBBox null>>setpagedevice"
+*PageSize EnvISOB5/Envelope B5: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+*PageSize Env10/Envelope #10:	"<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
+*PageSize EnvC5/Envelope C5:	"<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+*PageSize EnvDL/Envelope DL:	"<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
+*PageSize EnvMonarch/Envelope Monarch: "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageSize
+
+*OpenUI *PageRegion: PickOne
+*OrderDependency: 10 AnySetup *PageRegion
+*DefaultPageRegion: A4
+*PageRegion Letter/US Letter:	"<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*PageRegion Legal/US Legal:	"<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+*PageRegion Executive/US Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+*PageRegion Tabloid/US Tabloid:	"<</PageSize[792 1224]/ImagingBBox null>>setpagedevice"
+*PageRegion A3/A3:		"<</PageSize[842 1191]/ImagingBBox null>>setpagedevice"
+*PageRegion A4/A4:		"<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
+*PageRegion A5/A5:		"<</PageSize[421 595]/ImagingBBox null>>setpagedevice"
+*PageRegion B5/B5 (JIS):	"<</PageSize[516 729]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvISOB5/Envelope B5: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+*PageRegion Env10/Envelope #10:	"<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvC5/Envelope C5:	"<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvDL/Envelope DL:	"<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvMonarch/Envelope Monarch: "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageRegion
+
+*DefaultImageableArea: A4 
+*ImageableArea Letter/US Letter:	"18 36 594 756"
+*ImageableArea Legal/US Legal:		"18 36 594 972"
+*ImageableArea Executive/US Executive:	"18 36 504 684"
+*ImageableArea Tabloid/US Tabloid:	"18 36 774 1188"
+*ImageableArea A3/A3:			"18 36 824 1155"
+*ImageableArea A4/A4:			"18 36 577 806"
+*ImageableArea A5/A5:			"18 36 403 559"
+*ImageableArea B5/JIS B5:		"18 36 498 693"
+*ImageableArea EnvISOB5/B5 (ISO):	"18 36 463 673"
+*ImageableArea Env10/Com-10:		"18 36 279 648"
+*ImageableArea EnvC5/EnvC5:		"18 36 441 613"
+*ImageableArea EnvDL/EnvDL:		"18 36 294 588"
+*ImageableArea EnvMonarch/Envelope Monarch: "18 36 261 504"
+
+*DefaultPaperDimension: A4
+*PaperDimension Letter/US Letter:	"612 792"
+*PaperDimension Legal/US Legal:		"612 1008"
+*PaperDimension Executive/US Executive:	"522 756"
+*PaperDimension Tabloid/US Tabloid:	"792 1224"
+*PaperDimension A3/A3:			"842 1191"
+*PaperDimension A4/A4:			"595 842"
+*PaperDimension A5/A5:			"421 595"
+*PaperDimension B5/B5 (JIS):		"516 729"
+*PaperDimension EnvISOB5/Envelope B5:	"499 709"
+*PaperDimension Env10/Envelope #10:	"297 684"
+*PaperDimension EnvC5/Envelope C5:	"459 649"
+*PaperDimension EnvDL/Envelope DL:	"312 624"
+*PaperDimension EnvMonarch/Envelope Monarch: "279 540"
+
+*DefaultFont: Courier
+*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM
+*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM
+*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM
+*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM
+*Font Bookman-Demi: Standard "(001.004S)" Standard ROM
+*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM
+*Font Bookman-Light: Standard "(001.004S)" Standard ROM
+*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM
+*Font Courier: Standard "(002.004S)" Standard ROM
+*Font Courier-Bold: Standard "(002.004S)" Standard ROM
+*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM
+*Font Courier-Oblique: Standard "(002.004S)" Standard ROM
+*Font Helvetica: Standard "(001.006S)" Standard ROM
+*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM
+*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM
+*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM
+*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM
+*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM
+*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM
+*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM
+*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM
+*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM
+*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM
+*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM
+*Font Palatino-Bold: Standard "(001.005S)" Standard ROM
+*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM
+*Font Palatino-Italic: Standard "(001.005S)" Standard ROM
+*Font Palatino-Roman: Standard "(001.005S)" Standard ROM
+*Font Symbol: Special "(001.007S)" Special ROM
+*Font Times-Bold: Standard "(001.007S)" Standard ROM
+*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM
+*Font Times-Italic: Standard "(001.007S)" Standard ROM
+*Font Times-Roman: Standard "(001.007S)" Standard ROM
+*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
+*Font ZapfDingbats: Special "(001.004S)" Standard ROM
+*%
+*% End of "$Id: pdf.ppd,v 1.2 2003/01/02 15:47:37 gurubert Exp $".
+*%
--- a/65
+++ b/65
@ -0,0 +1,65 @@
+#!/bin/sh
+
+# $Id: pstopdf,v 1.2 2003/01/02 15:39:26 gurubert Exp $
+#
+# This is a Postscript to PDF filter for CUPS
+#
+# (C) 2003 Robert Sander <robert.sander@epigenomics.com>
+#
+# Released under GPL
+#
+# NO WARRANTY AT ALL
+#
+
+echo "INFO: pstopdf argv[$#] = $@" >&2
+
+if [ $# -lt 5 -o $# -gt 6 ]; then
+
+  echo "ERROR: $0 job-id user title copies options [file]" >&2
+  exit 1
+
+fi
+
+jobid=$1
+
+#infile=`mktemp /tmp/$jobid.pstopdf.in.XXXXXX`
+#if [ $? -ne 0 ]; then
+#  echo "ERROR: Error creating tmpfile $infile" >&2
+#  exit 1
+#fi
+#outfile=`mktemp /tmp/$jobid.pstopdf.out.XXXXXX`
+#if [ $? -ne 0 ]; then
+#  echo "ERROR: Error creating tmpfile $outfile" >&2
+#  exit 1
+#fi
+
+if [ $# -eq 6 ]; then
+
+  echo "INFO: file is $6" >&2
+  #cp $6 $infile
+  #rm -f $6
+
+  infile="$6"
+  outfile="$infile".pdf
+
+  /usr/bin/ps2pdf "$infile" "$outfile" 2>&1 >> /tmp/pstopdf.log
+
+else
+
+  outfile=`mktemp /tmp/$jobid.pstopdf.out.XXXXXX`
+  if [ $? -ne 0 ]; then
+    echo "ERROR: Error creating tmpfile $outfile" >&2
+    exit 1
+  fi
+
+  /usr/bin/ps2pdf - "$outfile" 2>&1 >> /tmp/pstopdf.log
+
+fi
+
+cat $outfile
+
+# cp "$infile" "$outfile" /tmp/cups/
+
+rm -f "$outfile"
+
+exit 0
--- a/cups.changes
+++ b/cups.changes
@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Apr  8 20:47:47 CEST 2008 - kssingvo@suse.de
+
+- added missing directory /var/cache/cups to %files
+- added pstopdf filter (from cups-mailto project at sourceforge.net)
+
+-------------------------------------------------------------------
+Tue Apr  8 10:11:36 CEST 2008 - kssingvo@suse.de
+
+- enabled krb5 support on request (bugzilla#377645)
+- enabled further configure options: gcc's relro, gssapi
+- and for run of cupsd: java, php, python (needs further activation)
+
 -------------------------------------------------------------------
 Wed Apr  2 10:29:42 CEST 2008 - kssingvo@suse.de

--- a/cups.spec
+++ b/cups.spec
@ -12,9 +12,9 @@


 Name:           cups
-BuildRequires:  dbus-1-devel gcc-c++ libpng-devel libtiff-devel openldap2-devel
-BuildRequires:  openslp-devel openssl-devel pam-devel tcpd-devel
-BuildRequires:  update-desktop-files
+BuildRequires:  dbus-1-devel gcc-c++ krb5-devel libpng-devel libtiff-devel
+BuildRequires:  openldap2-devel openslp-devel openssl-devel pam-devel
+BuildRequires:  pkg-config tcpd-devel update-desktop-files
 PreReq:         textutils, fileutils, sh-utils, %insserv_prereq,
 PreReq:         %fillup_prereq /usr/sbin/groupadd
 Url:            http://www.cups.org/
@ -22,7 +22,7 @@ License:        GPL v2 or later
 Group:          Hardware/Printing
 Summary:        The Common UNIX Printing System
 Version:        1.3.7
-Release:        1
+Release:        3
 Requires:       cups-libs = %{version}, cups-client = %{version}
 Requires:       ghostscript_any, ghostscript-fonts-std, foomatic-filters
 Requires:       util-linux
@ -43,6 +43,8 @@ Source14:       cups.xinetd
 Source15:       PSLEVEL1.PPD.bz2
 Source16:       PSLEVEL2.PPD.bz2
 Source17:       cups.SuSEfirewall2
+Source18:       http://download.sourceforge.net/cups-mailto/cups-pdf.ppd
+Source19:       http://download.sourceforge.net/cups-mailto/cups-pstopdf
 Patch1:         cups-1.3.3-mime.patch
 Patch2:         cups-1.2.0-ppdsdat_generation.patch
 Patch3:         cups-1.2rc1-template.patch
@ -186,10 +188,17 @@ export CXX=g++
 	--with-cups-user=lp \
 	--with-cups-group=lp \
 	--enable-pie \
+	--enable-relro \
+	--enable-gssapi \
 	--enable-static \
 	--without-rcdir \
 	--enable-dbus \
 	--enable-ldap \
+	--with-java \
+	--with-php \
+	--with-python \
+	--with-python \
+	--with-cachedir \
 	--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
@ -212,6 +221,7 @@ fi
 %{INSTALL_SCRIPT} %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/cups/filter
 %{INSTALL_SCRIPT} %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/cups/filter
 %{INSTALL_SCRIPT} %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/cups/filter
+%{INSTALL_SCRIPT} %{SOURCE19} $RPM_BUILD_ROOT%{_libdir}/cups/filter/pstopdf
 # might no longer be needed: ln -s /etc/cups/printcap $RPM_BUILD_ROOT/etc
 # install the two little tools
 install -m 755 poll_ppd_base $RPM_BUILD_ROOT/usr/bin/
@ -237,6 +247,7 @@ ln -sf libcupsimage.so.2 $RPM_BUILD_ROOT%{_libdir}/libcupsimage.so
 ln -sf libcups.so.2 $RPM_BUILD_ROOT%{_libdir}/libcups.so
 ln -sf ../sbin/lpc $RPM_BUILD_ROOT/usr/bin/lpc # bugzilla#16652
 %{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/cups/drivers
+%{INSTALL_DIR} $RPM_BUILD_ROOT/var/cache/cups
 %{INSTALL_DIR} $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}
 %{INSTALL_DIR} $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/images
 install -m 644 -D conf/pam.suse $RPM_BUILD_ROOT/etc/pam.d/cups
@ -248,6 +259,7 @@ done
 bzip2 -cd < %{SOURCE12} > $RPM_BUILD_ROOT%{_datadir}/cups/model/Postscript.ppd
 bzip2 -cd < %{SOURCE15} > $RPM_BUILD_ROOT%{_datadir}/cups/model/Postscript-level1.ppd
 bzip2 -cd < %{SOURCE16} > $RPM_BUILD_ROOT%{_datadir}/cups/model/Postscript-level2.ppd
+%{INSTALL_DATA} %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/cups/model/PDF.ppd
 find %{buildroot}/usr/share/cups/model -name "*.ppd" | while read FILE
 do
    # change default paper size from letter to A4 if possible (bugzilla#30662)
@ -342,6 +354,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/locale/no
 /usr/share/pixmaps/cups.png
 /usr/share/cups/[bcf-t]*
 /usr/share/cups/d[ao]*
+%dir %attr(0775,lp,lp) /var/cache/cups
 %config %attr(0755,root,root) /etc/init.d/cups
 %config /etc/pam.d/cups
 /var/adm/fillup-templates/sysconfig.cups
@ -390,6 +403,13 @@ rm -rf $RPM_BUILD_ROOT/usr/share/locale/no
 %{_datadir}/locale/*/cups_*

 %changelog
+* 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)
+* Tue Apr 08 2008 kssingvo@suse.de
+- enabled krb5 support on request (bugzilla#377645)
+- enabled further configure options: gcc's relro, gssapi
+- and for run of cupsd: java, php, python (needs further activation)
 * Wed Apr 02 2008 kssingvo@suse.de
 - update to version 1.3.7:
  bugfix version only, includes CVE-2008-0047 and CVE-2008-1373.