diff --git a/cups-includeifexists.patch b/cups-includeifexists.patch new file mode 100644 index 0000000..6555cfb --- /dev/null +++ b/cups-includeifexists.patch @@ -0,0 +1,20 @@ +--- 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")) { diff --git a/cups.spec b/cups.spec index 1e3fa59..118a81c 100644 --- a/cups.spec +++ b/cups.spec @@ -27,6 +27,7 @@ Patch2: cups-no-gzip-man.patch 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 @@ -114,6 +115,7 @@ lpd emulation. %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 @@ -384,6 +386,10 @@ rm -rf $RPM_BUILD_ROOT %{cups_serverbin}/daemon/cups-lpd %changelog +* Tue Apr 25 2006 Tim Waugh +- Patch pdftops to understand 'includeifexists', and use that in the + pdftops.conf file (bug #189809). + * Mon Apr 24 2006 Tim Waugh 1:1.2-0.5.rc3.1 - 1.2rc3. - Ship an snmp.conf. diff --git a/pdftops.conf b/pdftops.conf index 2a3ce34..30149e4 100644 --- a/pdftops.conf +++ b/pdftops.conf @@ -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