[foomatic/f12/master] 4.0.5

[Jiří Popelka]

commit e3e333499d7aa906df20deaf2329a4a6f1b0e139
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Aug 18 14:44:33 2010 +0200

    4.0.5

 .gitignore             |    2 ++
 foomatic-mkstemp.patch |   10 +++++-----
 foomatic.spec          |   14 +++++++-------
 sources                |    4 ++--
 4 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4a7ae14..bddba1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,5 @@ foomatic-db-engine-4.0.3.tar.gz
 foomatic-filters-4.0.3.tar.gz
 foomatic-db-engine-4.0.4.tar.gz
 foomatic-filters-4.0.4.tar.gz
+/foomatic-db-engine-4.0.5.tar.gz
+/foomatic-filters-4.0.5.tar.gz
diff --git a/foomatic-mkstemp.patch b/foomatic-mkstemp.patch
index 3543d17..3bb839b 100644
--- a/foomatic-mkstemp.patch
+++ b/foomatic-mkstemp.patch
@@ -1,7 +1,7 @@
-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.4/pdf.c.mkstemp	2010-02-15 13:57:40.000000000 +0100
-+++ foomatic-filters-4.0.4/pdf.c	2010-02-15 17:58:11.000000000 +0100
-@@ -112,13 +112,14 @@ static int pdf_extract_pages(char filena
+diff -up foomatic-filters-4.0.5/pdf.c.mkstemp foomatic-filters-4.0.5/pdf.c
+--- foomatic-filters-4.0.5/pdf.c.mkstemp	2010-08-10 12:08:04.000000000 +0200
++++ foomatic-filters-4.0.5/pdf.c	2010-08-18 12:34:11.000000000 +0200
+@@ -110,13 +110,14 @@ static int pdf_extract_pages(char filena
  {
      char gscommand[4095];
      char filename_arg[PATH_MAX], first_arg[50], last_arg[50];
@@ -13,7 +13,7 @@ diff -up foomatic-filters-4.0.4/pdf.c.mkstemp foomatic-4.0.4/foomatic-filters-4.
 -    mktemp(filename);
 -    if (!filename[0])
 +    if ((fd = mkstemp(filename)) == -1)
-         return 0;
+         rip_die(EXIT_STARVED, "Unable to create temporary file!\n");
 +    close (fd);
  
      snprintf(filename_arg, PATH_MAX, "-sOutputFile=%s", filename);
diff --git a/foomatic.spec b/foomatic.spec
index f9b6024..f5dc7b4 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,10 +1,10 @@
-%define enginever 4.0.4
-%define filtersver 4.0.4
+%define enginever 4.0.5
+%define filtersver 4.0.5
 
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	%{enginever}
-Release:    2%{?dist}
+Release:	1%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -28,9 +28,6 @@ Patch101: foomatic-db-engine-libdir.patch
 # Handle non-UTF-8 encodings in imported PPD files.
 Patch102: foomatic-bad-utf8.patch
 
-# Fixed installation path for perl module.
-Patch103: foomatic-db-engine-perl.patch
-
 ## PATCHES FOR FOOMATIC-DB-HPIJS (PATCHES 201 TO 300)
 
 Url:		http://www.linuxprinting.org
@@ -82,7 +79,6 @@ pushd foomatic-db-engine-%{enginever}
 chmod a+x mkinstalldirs
 %patch101 -p1 -b .libdir
 %patch102 -p1
-%patch103 -p1 -b .perl
 aclocal
 autoconf
 popd
@@ -160,6 +156,10 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Wed Aug 18 2010 Jiri Popelka <jpopelka at redhat.com> - 4.0.5-1
+- 4.0.5
+- fixing of installation path for perl module is no longer needed
+
 * Thu Mar 18 2010 Tim Waugh <twaugh at redhat.com> - 4.0.4-2
 - Package requires ghostscript (used by foomatic-rip).
 
diff --git a/sources b/sources
index c665d31..1b81a2d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-675999e0ab8d59ad34a805c378830354  foomatic-db-engine-4.0.4.tar.gz
-f67fc793ee8d4d076c6671d6e6a72367  foomatic-filters-4.0.4.tar.gz
+0893a4a9705ffd7305bc50cbb951daf9  foomatic-db-engine-4.0.5.tar.gz
+fd99dac3a36807a47ffa4f9eb15c1b07  foomatic-filters-4.0.5.tar.gz