rpms/foomatic/F-11 .cvsignore, 1.75, 1.76 foomatic-mkstemp.patch, 1.1, 1.2 foomatic.spec, 1.228, 1.229 sources, 1.78, 1.79 foomatic-filters-int-options.patch, 1.1, NONE

Tue Feb 16 13:54:47 UTC 2010

Author: jpopelka

Update of /cvs/pkgs/rpms/foomatic/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13425

Modified Files:
	.cvsignore foomatic-mkstemp.patch foomatic.spec sources 
Removed Files:
	foomatic-filters-int-options.patch 
Log Message:
* Tue Feb 16 2010 Jiri Popelka <jpopelka at redhat.com> - 4.0.4-1
- 4.0.4
- build no more requires ghostscript-devel
- removed foomatic-filters-int-options.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-11/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76

--- .cvsignore	26 Nov 2009 11:21:43 -0000	1.75
+++ .cvsignore	16 Feb 2010 13:54:47 -0000	1.76
@@ -81,3 +81,5 @@ foomatic-db-4.0-20090819.tar.gz
 foomatic-db-engine-4.0.3.tar.gz
 foomatic-filters-4.0.3.tar.gz
 foomatic-db-4.0-20091126.tar.gz
+foomatic-db-engine-4.0.4.tar.gz
+foomatic-filters-4.0.4.tar.gz

foomatic-mkstemp.patch:
 pdf.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: foomatic-mkstemp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-11/foomatic-mkstemp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- foomatic-mkstemp.patch	2 Jul 2009 15:46:04 -0000	1.1
+++ foomatic-mkstemp.patch	16 Feb 2010 13:54:47 -0000	1.2
@@ -1,15 +1,12 @@
-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)
+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
  {
-     void *minst;
-+    int fd;
+     char gscommand[4095];
      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
++    int fd;
+ 
      _log("Extracting pages %d through %d\n", first, last);
  
      snprintf(filename, PATH_MAX, "%s/foomatic-XXXXXX", temp_dir());
@@ -17,8 +14,7 @@ diff -up foomatic-filters-4.0.2/pdf.c.mk
 -    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");
+ 
+     snprintf(filename_arg, PATH_MAX, "-sOutputFile=%s", filename);
+     snprintf(first_arg, 50, "-dFirstPage=%d", first);


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-11/foomatic.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -p -r1.228 -r1.229
--- foomatic.spec	19 Jan 2010 17:09:26 -0000	1.228
+++ foomatic.spec	16 Feb 2010 13:54:47 -0000	1.229
@@ -1,13 +1,13 @@
 %define dbver_rel 4.0
 %define dbver_snap 20091126
-%define enginever 4.0.3
-%define filtersver 4.0.3
+%define enginever 4.0.4
+%define filtersver 4.0.4
 %define hpijsver 20090701
 
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	%{enginever}
-Release:    5%{?dist}
+Release:    1%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -17,7 +17,7 @@ Group: System Environment/Libraries
 # tar cjf foomatic-1.9-$NOW.tar.bz2 foomatic
 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
 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
 
@@ -29,9 +29,6 @@ Patch1: foomatic-filters-libdir.patch
 # Use mkstemp, not mktemp.
 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)
 
 # Use libdir.
@@ -48,7 +45,6 @@ Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	libxml2-devel
-BuildRequires:	ghostscript-devel
 BuildRequires:	autoconf, automake
 Requires:	perl >= 3:5.8.1
 Requires:	%(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
@@ -92,7 +88,6 @@ The site http://www.linuxprinting.org/ i
 pushd foomatic-filters-%{filtersver}
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .mkstemp
-%patch3 -p1 -b .int-options
 popd
 
 pushd foomatic-db-engine-%{enginever}
@@ -249,6 +244,11 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Feb 16 2010 Jiri Popelka <jpopelka at redhat.com> - 4.0.4-1
+- 4.0.4
+- build no more requires ghostscript-devel
+- removed foomatic-filters-int-options.patch
+
 * Tue Jan 19 2010 Tim Waugh <twaugh at redhat.com> - 4.0.3-5
 - Fix for handling integer options (bug #531278).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-11/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sources	26 Nov 2009 11:21:43 -0000	1.78
+++ sources	16 Feb 2010 13:54:47 -0000	1.79
@@ -1,4 +1,4 @@
 2bc452f3bf81c83f8d008c95167f7f8b  foomatic-db-hpijs-20090701.tar.gz
-fdb02175cc857f63bb06b25ac3b1658b  foomatic-db-engine-4.0.3.tar.gz
-f2fb7c48cc6b1af6f76dd0529d6dbd98  foomatic-filters-4.0.3.tar.gz
 8e14309e17e7544f94f8df429bc691e4  foomatic-db-4.0-20091126.tar.gz
+675999e0ab8d59ad34a805c378830354  foomatic-db-engine-4.0.4.tar.gz
+f67fc793ee8d4d076c6671d6e6a72367  foomatic-filters-4.0.4.tar.gz


--- foomatic-filters-int-options.patch DELETED ---

