rpms/cups
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Patch pdftops to understand 'includeifexists', and use that in the

Browse Source 
pdftops.conf file (bug #189809).
This commit is contained in:
Tim Waugh 2006-04-25 12:38:48 +00:00
parent 998a64453d
commit 16d6860818
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cups-includeifexists.patch Normal file
View File

@ -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")) {

6
cups.spec
View File

@ -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 <twaugh@redhat.com>
- Patch pdftops to understand 'includeifexists', and use that in the
pdftops.conf file (bug #189809).
* Mon Apr 24 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.5.rc3.1
- 1.2rc3.
- Ship an snmp.conf.

8
pdftops.conf
View File

@ -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