- Updated db-engine to 4.0.2 (bug #503188).

- Updated foomatic-filters to 4.0.2 (bug #496521). - Updated db-hpijs to 20090701. - Updated db to 4.0-20090702. - This package obsoletes oki4linux (bug #491489). - Don't ship ChangeLog/README/USAGE for each of the 4 packages as it comes to more than 1MB (bug #492449). - Don't use mktemp in foomatic-rip.
2009-07-02 15:55:48 +00:00 · 2009-07-02 15:55:48 +00:00 · 4c4d5cdedc
parent 7dabf7c105
commit 4c4d5cdedc
4 changed files with 71 additions and 15 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -73,3 +73,7 @@ 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
--- a/foomatic-mkstemp.patch
+++ b/foomatic-mkstemp.patch
@ -0,0 +1,24 @@
+diff -up foomatic-filters-4.0.2/pdf.c.mkstemp foomatic-filters-4.0.2/pdf.c
+--- foomatic-filters-4.0.2/pdf.c.mkstemp	2009-07-02 15:52:38.960401425 +0100
+++ foomatic-filters-4.0.2/pdf.c	2009-07-02 16:24:39.966400563 +0100
+@@ -157,6 +157,7 @@ static int pdf_extract_pages(char filena
+                              int last)
+ {
+     void *minst;
+    int fd;
+     char filename_arg[PATH_MAX], first_arg[50], last_arg[50];
+     const char *gs_args[] = { "", "-q", "-dNOPAUSE", "-dBATCH",
+         "-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);
+ 
+     snprintf(filename, PATH_MAX, "%s/foomatic-XXXXXX", temp_dir());
+-    mktemp(filename);
+-    if (!filename[0])
+    if ((fd = mkstemp(filename)) == -1)
+         return 0;
+ 
+    close (fd);
+     if (gsapi_new_instance(&minst, NULL) < 0)
+     {
+         _log("Could not create ghostscript instance\n");
--- a/foomatic.spec
+++ b/foomatic.spec
@ -1,13 +1,13 @@
 %define dbver_rel 4.0
-%define dbver_snap 20090115
-%define enginever 4.0.0
-%define filtersver 4.0.0
-%define hpijsver 20090110
+%define dbver_snap 20090702
+%define enginever 4.0.2
+%define filtersver 4.0.2
+%define hpijsver 20090701

 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	%{enginever}
-Release:    2%{?dist}
+Release:    1%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries

@ -21,12 +21,25 @@ Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{filte
 Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
 Source3: http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz

+## PATCHES FOR FOOMATIC-FILTERS (PATCHES 1 TO 100)
+
 # Use libdir.
 Patch1: foomatic-filters-libdir.patch
-Patch2: foomatic-db-engine-libdir.patch
+
+# Use mkstemp, not mktemp.
+Patch2: foomatic-mkstemp.patch
+
+## PATCHES FOR FOOMATIC-DB-ENGINE (PATCHES 101 TO 200)
+
+# Use libdir.
+Patch101: foomatic-db-engine-libdir.patch

 # Handle non-UTF-8 encodings in imported PPD files.
-Patch15: foomatic-bad-utf8.patch
+Patch102: foomatic-bad-utf8.patch
+
+## PATCHES FOR FOOMATIC-DB-HPIJS (PATCHES 201 TO 300)
+
+## PATCHES FOR FOOMATIC-DB (PATCHES 301 TO 400)

 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
@ -51,6 +64,11 @@ Conflicts: hpijs < 1.5
 # We don't use the printconf hooks now, so require that they are gone.
 Conflicts: system-config-printer < 0.7.0

+# The foomatic oki8w driver works for printers that this old package
+# use to drive:
+Obsoletes: oki4linux < 2.1gst-5
+# Note: no "Provides:" as it was not a dependency of any package.
+
 %description
 Foomatic is a comprehensive, spooler-independent database of printers,
 printer drivers, and driver descriptions. It contains utilities to
@ -70,12 +88,13 @@ The site http://www.linuxprinting.org/ is based on this database.

 pushd foomatic-filters-%{filtersver}
 %patch1 -p1 -b .libdir
+%patch2 -p1 -b .mkstemp
 popd

 pushd foomatic-db-engine-%{enginever}
 chmod a+x mkinstalldirs
-%patch2 -p1 -b .libdir
-%patch15 -p1
+%patch101 -p1 -b .libdir
+%patch102 -p1
 popd

 pushd foomatic-db-hpijs-%{hpijsver}
@ -115,7 +134,7 @@ export CUPS_PPDS=%{_datadir}/cups/model

 pushd foomatic-filters-%{filtersver}
 %configure
-make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
+make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS -O0"
 popd

 pushd foomatic-db-engine-%{enginever}
@ -209,7 +228,6 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}

 %files
 %defattr(-,root,root)
-%doc --parents */README */USAGE */ChangeLog
 %dir %{_sysconfdir}/foomatic
 %config(noreplace) %{_sysconfdir}/foomatic/filter.conf
 %config(noreplace) %{_sysconfdir}/foomatic/defaultspooler
@ -224,6 +242,16 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic

 %changelog
+* Thu Jul  2 2009 Tim Waugh <twaugh@redhat.com> 4.0.2-1
+- Updated db-engine to 4.0.2 (bug #503188).
+- Updated foomatic-filters to 4.0.2 (bug #496521).
+- Updated db-hpijs to 20090701.
+- Updated db to 4.0-20090702.
+- This package obsoletes oki4linux (bug #491489).
+- Don't ship ChangeLog/README/USAGE for each of the 4 packages as it
+  comes to more than 1MB (bug #492449).
+- Don't use mktemp in foomatic-rip.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

--- a/8
+++ b/8
@ -1,4 +1,4 @@
-aa6b0fd89f33fcef91a3a7081b44fc36  foomatic-db-hpijs-20090110.tar.gz
-a349bc055d92a47bfbd8b7812beba690  foomatic-db-4.0-20090115.tar.gz
-7e2281ef8b96557afd0cd87400176805  foomatic-db-engine-4.0.0.tar.gz
-1c77a8c86a8fb19012cd79f735564ea2  foomatic-filters-4.0.0.tar.gz
+9d3a938be1c9ea00add9c7c467653861  foomatic-filters-4.0.2.tar.gz
+8595d59be013482e4dd2834adf11f55a  foomatic-db-engine-4.0.2.tar.gz
+2bc452f3bf81c83f8d008c95167f7f8b  foomatic-db-hpijs-20090701.tar.gz
+df252272fd8f802c57650bbc059a0f42  foomatic-db-4.0-20090702.tar.gz