rpms/foomatic
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- 4.0.4

Browse Source 
- build no more requires ghostscript-devel
- removed foomatic-filters-int-options.patch
This commit is contained in:
Jiří Popelka 2010-02-16 10:38:40 +00:00
parent 89fc0b7301
commit 2bd530860f
5 changed files with 23 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
.cvsignore
View File

@ -1,81 +1,2 @@
Omni-printers-0.9.1.tar.bz2 foomatic-db-engine-4.0.4.tar.gz
foomatic-db-20040712.tar.gz foomatic-filters-4.0.4.tar.gz
foomatic-db-engine-3.0.1.tar.gz
foomatic-db-hpijs-1.5-20040219.tar.gz
foomatic-filters-3.0.1.tar.gz
gimp-print-foomatic-db-4.2.7.tar.bz2
foomatic-db-engine-3.0.2.tar.gz
foomatic-filters-3.0.2.tar.gz
foomatic-db-hpijs-1.5-20041124.tar.gz
foomatic-db-20041124.tar.gz
Omni-printers-0.9.2.tar.bz2
foomatic-db-20041206.tar.gz
foomatic-db-20050118.tar.gz
foomatic-db-20050216.tar.gz
foomatic-db-20050310.tar.gz
foomatic-db-20050613.tar.gz
foomatic-db-hpijs-1.5-20050613.tar.gz
foomatic-db-20050703.tar.gz
foomatic-db-20050718.tar.gz
foomatic-db-3.0-20050726.tar.gz
foomatic-db-3.0-20050804.tar.gz
foomatic-db-3.0-20050907.tar.gz
foomatic-db-engine-3.0-20050907.tar.gz
foomatic-db-3.0-20051209.tar.gz
foomatic-filters-3.0-20051209.tar.gz
foomatic-db-hpijs-1.5-20051209.tar.gz
foomatic-db-engine-3.0-20051209.tar.gz
foomatic-db-3.0-20060103.tar.gz
foomatic-db-3.0-20060116.tar.gz
foomatic-db-engine-3.0-20060117.tar.gz
foomatic-db-engine-3.0-20060421.tar.gz
foomatic-db-engine-3.0-20061031.tar.gz
foomatic-db-3.0-20061031.tar.gz
foomatic-db-hpijs-1.5-20040219.tar.gz
foomatic-db-hpijs-1.5-20041124.tar.gz
foomatic-db-hpijs-1.5-20050613.tar.gz
foomatic-db-hpijs-1.5-20051209.tar.gz
foomatic-db-hpijs-20061031.tar.gz
foomatic-db-engine-3.0-20061109.tar.gz
foomatic-db-3.0-20061130.tar.gz
foomatic-db-3.0-20070105.tar.gz
foomatic-filters-3.0-20070614.tar.gz
foomatic-db-hpijs-20070614.tar.gz
foomatic-db-engine-3.0-20070614.tar.gz
foomatic-db-3.0-20070614.tar.gz
foomatic-db-3.0-20070919.tar.gz
foomatic-filters-3.0-20070919.tar.gz
foomatic-filters-3.0-20071218.tar.gz
foomatic-db-engine-3.0-20071218.tar.gz
foomatic-db-3.0-20071218.tar.gz
foomatic-db-hpijs-20071218.tar.gz
foomatic-db-3.0-20080211.tar.gz
foomatic-db-engine-3.0-20080211.tar.gz
foomatic-db-hpijs-20080211.tar.gz
foomatic-filters-3.0-20080211.tar.gz
foomatic-filters-3.0-20080507.tar.gz
foomatic-db-engine-3.0-20080710.tar.gz
foomatic-filters-3.0-20080710.tar.gz
foomatic-db-3.0-20080710.tar.gz
foomatic-db-hpijs-20080710.tar.gz
foomatic-db-engine-3.0-20080904.tar.gz
foomatic-filters-3.0-20080904.tar.gz
foomatic-db-3.0-20080904.tar.gz
foomatic-db-hpijs-20080904.tar.gz
foomatic-db-engine-3.0-20081124.tar.gz
foomatic-filters-3.0-20081124.tar.gz
foomatic-db-3.0-20081124.tar.gz
foomatic-db-hpijs-20081124.tar.gz
foomatic-db-engine-3.0-20090110.tar.gz
foomatic-db-3.0-20090110.tar.gz
foomatic-db-hpijs-20090110.tar.gz
foomatic-filters-3.0-20090110.tar.gz
foomatic-db-4.0-20090115.tar.gz
foomatic-db-engine-4.0.0.tar.gz
foomatic-filters-4.0.0.tar.gz
foomatic-filters-4.0.2.tar.gz
foomatic-db-engine-4.0.2.tar.gz
foomatic-db-hpijs-20090701.tar.gz
foomatic-db-4.0-20090702.tar.gz
foomatic-db-engine-4.0.3.tar.gz
foomatic-filters-4.0.3.tar.gz

13
foomatic-filters-int-options.patch
View File

@ -1,13 +0,0 @@
diff -up foomatic-filters-4.0.3/options.c.int-options foomatic-filters-4.0.3/options.c
--- foomatic-filters-4.0.3/options.c.int-options 2009-08-19 19:08:41.000000000 +0100
+++ foomatic-filters-4.0.3/options.c 2010-01-19 16:43:09.343981005 +0000
@@ -863,7 +863,8 @@ int option_get_command(dstr_t *cmd, opti
/* If the value is set to a predefined choice */
choice = option_find_choice(opt, valstr);
- if (choice) {
+ if (choice && (*choice->command ||
+ ((opt->type != TYPE_INT) && (opt->type != TYPE_FLOAT)))) {
dstrcpy(cmd, choice->command);
return 1;
}

24
foomatic-mkstemp.patch
View File

@ -1,15 +1,12 @@
diff -up foomatic-filters-4.0.2/pdf.c.mkstemp foomatic-filters-4.0.2/pdf.c diff -up foomatic-filters-4.0.4/pdf.c.mkstemp foomatic-4.0.4/foomatic-filters-4.0.4/pdf.c
--- foomatic-filters-4.0.2/pdf.c.mkstemp 2009-07-02 15:52:38.960401425 +0100 --- foomatic-filters-4.0.4/pdf.c.mkstemp 2010-02-15 13:57:40.000000000 +0100
+++ foomatic-filters-4.0.2/pdf.c 2009-07-02 16:24:39.966400563 +0100 +++ foomatic-filters-4.0.4/pdf.c 2010-02-15 17:58:11.000000000 +0100
@@ -157,6 +157,7 @@ static int pdf_extract_pages(char filena @@ -112,13 +112,14 @@ static int pdf_extract_pages(char filena
int last)
{ {
void *minst; char gscommand[4095];
+ int fd;
char filename_arg[PATH_MAX], first_arg[50], last_arg[50]; char filename_arg[PATH_MAX], first_arg[50], last_arg[50];
const char *gs_args[] = { "", "-q", "-dNOPAUSE", "-dBATCH", + int fd;
"-dPARANOIDSAFER", "-sDEVICE=pdfwrite", filename_arg, first_arg,
@@ -165,10 +166,10 @@ static int pdf_extract_pages(char filena
_log("Extracting pages %d through %d\n", first, last); _log("Extracting pages %d through %d\n", first, last);
snprintf(filename, PATH_MAX, "%s/foomatic-XXXXXX", temp_dir()); snprintf(filename, PATH_MAX, "%s/foomatic-XXXXXX", temp_dir());
@ -17,8 +14,7 @@ diff -up foomatic-filters-4.0.2/pdf.c.mkstemp foomatic-filters-4.0.2/pdf.c
- if (!filename[0]) - if (!filename[0])
+ if ((fd = mkstemp(filename)) == -1) + if ((fd = mkstemp(filename)) == -1)
return 0; return 0;
+ close (fd); + close (fd);
if (gsapi_new_instance(&minst, NULL) < 0)
{ snprintf(filename_arg, PATH_MAX, "-sOutputFile=%s", filename);
_log("Could not create ghostscript instance\n"); snprintf(first_arg, 50, "-dFirstPage=%d", first);

18
foomatic.spec
View File

@ -1,16 +1,16 @@
%define enginever 4.0.3 %define enginever 4.0.4
%define filtersver 4.0.3 %define filtersver 4.0.4
Summary: Database of printers and printer drivers Summary: Database of printers and printer drivers
Name: foomatic Name: foomatic
Version: %{enginever} Version: %{enginever}
Release: 13%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
Source0: http://www.openprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz Source0: http://www.openprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz
Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{filtersver}.tar.gz Source1: http://www.openprinting.org/download/foomatic/foomatic-filters-%{filtersver}.tar.gz
## PATCHES FOR FOOMATIC-FILTERS (PATCHES 1 TO 100) ## PATCHES FOR FOOMATIC-FILTERS (PATCHES 1 TO 100)
@ -20,9 +20,6 @@ Patch1: foomatic-filters-libdir.patch
# Use mkstemp, not mktemp. # Use mkstemp, not mktemp.
Patch2: foomatic-mkstemp.patch Patch2: foomatic-mkstemp.patch
# Fix for handling integer options (bug #531278).
Patch3: foomatic-filters-int-options.patch
## PATCHES FOR FOOMATIC-DB-ENGINE (PATCHES 101 TO 200) ## PATCHES FOR FOOMATIC-DB-ENGINE (PATCHES 101 TO 200)
# Use libdir. # Use libdir.
@ -40,7 +37,6 @@ Url: http://www.linuxprinting.org
BuildRequires: perl >= 3:5.8.1 BuildRequires: perl >= 3:5.8.1
BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: ghostscript-devel
BuildRequires: autoconf, automake BuildRequires: autoconf, automake
BuildRequires: cups BuildRequires: cups
Requires: perl >= 3:5.8.1 Requires: perl >= 3:5.8.1
@ -80,7 +76,6 @@ The site http://www.linuxprinting.org/ is based on this database.
pushd foomatic-filters-%{filtersver} pushd foomatic-filters-%{filtersver}
%patch1 -p1 -b .libdir %patch1 -p1 -b .libdir
%patch2 -p1 -b .mkstemp %patch2 -p1 -b .mkstemp
%patch3 -p1 -b .int-options
aclocal aclocal
automake automake
autoconf autoconf
@ -169,6 +164,11 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
%{_var}/cache/foomatic %{_var}/cache/foomatic
%changelog %changelog
* Tue Feb 16 2010 Jiri Popelka <jpopelka@redhat.com> - 4.0.4-1
- 4.0.4
- build no more requires ghostscript-devel
- removed foomatic-filters-int-options.patch
* Fri Feb 5 2010 Tim Waugh <twaugh@redhat.com> - 4.0.3-13 * Fri Feb 5 2010 Tim Waugh <twaugh@redhat.com> - 4.0.3-13
- Use relative, not absolute, symlink for CUPS driver. - Use relative, not absolute, symlink for CUPS driver.

4
sources
View File

@ -1,2 +1,2 @@
fdb02175cc857f63bb06b25ac3b1658b foomatic-db-engine-4.0.3.tar.gz 675999e0ab8d59ad34a805c378830354 foomatic-db-engine-4.0.4.tar.gz
f2fb7c48cc6b1af6f76dd0529d6dbd98 foomatic-filters-4.0.3.tar.gz f67fc793ee8d4d076c6671d6e6a72367 foomatic-filters-4.0.4.tar.gz