rpms/cups/FC-5 cups-includeifexists.patch, NONE, 1.1 cups.spec, 1.162, 1.163 pdftops.conf, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27320

Modified Files:
	cups.spec pdftops.conf 
Added Files:
	cups-includeifexists.patch 
Log Message:
* Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>
- Patch pdftops to understand 'includeifexists', and use that in the
  pdftops.conf file (bug #189809).


cups-includeifexists.patch:
 GlobalParams.cxx |   11 +++++++++++
 1 files changed, 11 insertions(+)

--- NEW FILE cups-includeifexists.patch ---
--- cups-1.2rc3/pdftops/GlobalParams.cxx.includeifexists	2006-04-25 13:19:09.000000000 +0100
+++ cups-1.2rc3/pdftops/GlobalParams.cxx	2006-04-25 13:19:12.000000000 +0100
@@ -536,6 +536,17 @@
 	  error(-1, "Bad 'include' config file command (%s:%d)",
 		fileName->getCString(), line);
 	}
+      } else if (!cmd->cmp("includeifexists")) {
+	if (tokens->getLength() == 2) {
+	  incFile = (GString *)tokens->get(1);
+	  if ((f2 = fopen(incFile->getCString(), "r"))) {
+	    parseFile(incFile, f2);
+	    fclose(f2);
+	  }
+	} else {
+	  error(-1, "Bad 'includeifexists' config file command (%s:%d)",
+		fileName->getCString(), line);
+	}
       } else if (!cmd->cmp("nameToUnicode")) {
 	parseNameToUnicode(tokens, fileName, line);
       } else if (!cmd->cmp("cidToUnicode")) {


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- cups.spec	24 Apr 2006 17:09:26 -0000	1.162
+++ cups.spec	25 Apr 2006 12:38:12 -0000	1.163
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.4.1.%{beta}.1
+Release: 0.4.1.%{beta}.1.0.1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -27,6 +27,7 @@
 Patch3: cups-1.1.16-system-auth.patch
 Patch4: cups-1.1.17-backend.patch
 Patch5: cups-ext.patch
+Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
 Patch8: cups-logfileperm.patch
 Patch9: cups-1.1.17-rcp.patch
@@ -119,6 +120,7 @@
 %patch3 -p1 -b .system-auth
 %patch4 -p1 -b .backend
 %patch5 -p1 -b .ext
+%patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
 %patch8 -p1 -b .logfileperm
 %patch9 -p1 -b .rcp
@@ -389,6 +391,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>
+- Patch pdftops to understand 'includeifexists', and use that in the
+  pdftops.conf file (bug #189809).
+
 * Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.4.1.rc3.1
 - 1.2rc3.
 - Ship an snmp.conf.


Index: pdftops.conf
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/pdftops.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pdftops.conf	11 Apr 2006 17:09:20 -0000	1.1
+++ pdftops.conf	25 Apr 2006 12:38:12 -0000	1.2
@@ -1,4 +1,4 @@
-include /usr/share/xpdf/japanese/add-to-xpdfrc
-include /usr/share/xpdf/korean/add-to-xpdfrc
-include /usr/share/xpdf/chinese-simplified/add-to-xpdfrc
-include /usr/share/xpdf/chinese-traditional/add-to-xpdfrc
+includeifexists /usr/share/xpdf/japanese/add-to-xpdfrc
+includeifexists /usr/share/xpdf/korean/add-to-xpdfrc
+includeifexists /usr/share/xpdf/chinese-simplified/add-to-xpdfrc
+includeifexists /usr/share/xpdf/chinese-traditional/add-to-xpdfrc