From b04abed23efe126c43733a884315c021d9d46ae0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 04:51:55 +0000 Subject: [PATCH 01/13] Initialize branch F-12 for foomatic --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 0f0b3fe80da3565c2c5c12610ad555bce909b661 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 5 Nov 2009 16:02:11 +0000 Subject: [PATCH 02/13] - Correctly build foomatic custom commands (bug #531278). --- foomatic-filters-custom-command.patch | 12 ++++++++++++ foomatic.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 foomatic-filters-custom-command.patch diff --git a/foomatic-filters-custom-command.patch b/foomatic-filters-custom-command.patch new file mode 100644 index 0000000..e4cd588 --- /dev/null +++ b/foomatic-filters-custom-command.patch @@ -0,0 +1,12 @@ +diff -up foomatic-filters-4.0.3/options.c~ foomatic-filters-4.0.3/options.c +--- foomatic-filters-4.0.3/options.c~ 2009-08-19 19:08:41.000000000 +0100 ++++ foomatic-filters-4.0.3/options.c 2009-11-05 15:46:58.120129303 +0000 +@@ -863,7 +863,7 @@ 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 && *choice->command) { + dstrcpy(cmd, choice->command); + return 1; + } diff --git a/foomatic.spec b/foomatic.spec index fefce71..15f451f 100644 --- a/foomatic.spec +++ b/foomatic.spec @@ -4,7 +4,7 @@ Summary: Database of printers and printer drivers Name: foomatic Version: %{enginever} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -20,6 +20,9 @@ Patch1: foomatic-filters-libdir.patch # Use mkstemp, not mktemp. Patch2: foomatic-mkstemp.patch +# Correctly build foomatic custom commands (bug #531278). +Patch3: foomatic-filters-custom-command.patch + ## PATCHES FOR FOOMATIC-DB-ENGINE (PATCHES 101 TO 200) # Use libdir. @@ -68,6 +71,7 @@ The site http://www.linuxprinting.org/ is based on this database. pushd foomatic-filters-%{filtersver} %patch1 -p1 -b .libdir %patch2 -p1 -b .mkstemp +%patch3 -p1 -b .custom-command popd pushd foomatic-db-engine-%{enginever} @@ -148,6 +152,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name} %{_var}/cache/foomatic %changelog +* Thu Nov 5 2009 Tim Waugh 4.0.3-2 +- Correctly build foomatic custom commands (bug #531278). + * Tue Sep 1 2009 Tim Waugh 4.0.3-1 - 4.0.3. From c60e55b47989e4ccb806ccd73041656f2074d9f6 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Sun, 8 Nov 2009 21:01:42 +0000 Subject: [PATCH 03/13] - Revert last change. --- foomatic-filters-custom-command.patch | 19 ++++++++++--------- foomatic.spec | 9 ++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/foomatic-filters-custom-command.patch b/foomatic-filters-custom-command.patch index e4cd588..6374e4a 100644 --- a/foomatic-filters-custom-command.patch +++ b/foomatic-filters-custom-command.patch @@ -1,12 +1,13 @@ -diff -up foomatic-filters-4.0.3/options.c~ foomatic-filters-4.0.3/options.c ---- foomatic-filters-4.0.3/options.c~ 2009-08-19 19:08:41.000000000 +0100 -+++ foomatic-filters-4.0.3/options.c 2009-11-05 15:46:58.120129303 +0000 -@@ -863,7 +863,7 @@ int option_get_command(dstr_t *cmd, opti - - /* If the value is set to a predefined choice */ +diff -up foomatic-filters-4.0.3/options.c.custom-command foomatic-filters-4.0.3/options.c +--- foomatic-filters-4.0.3/options.c.custom-command 2009-08-19 19:08:41.000000000 +0100 ++++ foomatic-filters-4.0.3/options.c 2009-11-08 21:00:03.100887926 +0000 +@@ -865,7 +865,8 @@ int option_get_command(dstr_t *cmd, opti choice = option_find_choice(opt, valstr); -- if (choice) { -+ if (choice && choice->command && *choice->command) { + if (choice) { dstrcpy(cmd, choice->command); - return 1; +- return 1; ++ if (!option_use_foomatic_prototype(opt)) ++ return 1; } + + /* Consider "None" as the empty string for string and password options */ diff --git a/foomatic.spec b/foomatic.spec index 15f451f..5d27ed5 100644 --- a/foomatic.spec +++ b/foomatic.spec @@ -4,7 +4,7 @@ Summary: Database of printers and printer drivers Name: foomatic Version: %{enginever} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -20,9 +20,6 @@ Patch1: foomatic-filters-libdir.patch # Use mkstemp, not mktemp. Patch2: foomatic-mkstemp.patch -# Correctly build foomatic custom commands (bug #531278). -Patch3: foomatic-filters-custom-command.patch - ## PATCHES FOR FOOMATIC-DB-ENGINE (PATCHES 101 TO 200) # Use libdir. @@ -71,7 +68,6 @@ The site http://www.linuxprinting.org/ is based on this database. pushd foomatic-filters-%{filtersver} %patch1 -p1 -b .libdir %patch2 -p1 -b .mkstemp -%patch3 -p1 -b .custom-command popd pushd foomatic-db-engine-%{enginever} @@ -152,6 +148,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name} %{_var}/cache/foomatic %changelog +* Sun Nov 8 2009 Tim Waugh 4.0.3-3 +- Revert last change. + * Thu Nov 5 2009 Tim Waugh 4.0.3-2 - Correctly build foomatic custom commands (bug #531278). From be7549c78a5b2935fb4b9ce70ed716b08999802d Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Mon, 9 Nov 2009 11:00:35 +0000 Subject: [PATCH 04/13] Removed bogus patch. --- foomatic-filters-custom-command.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 foomatic-filters-custom-command.patch diff --git a/foomatic-filters-custom-command.patch b/foomatic-filters-custom-command.patch deleted file mode 100644 index 6374e4a..0000000 --- a/foomatic-filters-custom-command.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up foomatic-filters-4.0.3/options.c.custom-command foomatic-filters-4.0.3/options.c ---- foomatic-filters-4.0.3/options.c.custom-command 2009-08-19 19:08:41.000000000 +0100 -+++ foomatic-filters-4.0.3/options.c 2009-11-08 21:00:03.100887926 +0000 -@@ -865,7 +865,8 @@ int option_get_command(dstr_t *cmd, opti - choice = option_find_choice(opt, valstr); - if (choice) { - dstrcpy(cmd, choice->command); -- return 1; -+ if (!option_use_foomatic_prototype(opt)) -+ return 1; - } - - /* Consider "None" as the empty string for string and password options */ From 6ce0dc3e793c4cde3f239d50db24f70b80bf44a0 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 10 Nov 2009 11:44:22 +0000 Subject: [PATCH 05/13] - Require cups and don't own its directories (bug #534051). --- foomatic.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/foomatic.spec b/foomatic.spec index 5d27ed5..55bdee8 100644 --- a/foomatic.spec +++ b/foomatic.spec @@ -4,7 +4,7 @@ Summary: Database of printers and printer drivers Name: foomatic Version: %{enginever} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -47,6 +47,7 @@ PreReq: fileutils initscripts BuildRequires: mpage Requires: foomatic-db +Requires: cups %description Foomatic is a comprehensive, spooler-independent database of printers, @@ -68,12 +69,17 @@ The site http://www.linuxprinting.org/ is based on this database. pushd foomatic-filters-%{filtersver} %patch1 -p1 -b .libdir %patch2 -p1 -b .mkstemp +aclocal +automake +autoconf popd pushd foomatic-db-engine-%{enginever} chmod a+x mkinstalldirs %patch101 -p1 -b .libdir %patch102 -p1 +aclocal +autoconf popd %build @@ -142,12 +148,16 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name} %{_bindir}/* %{_sbindir}/* %{_prefix}/lib*/perl5/vendor_perl/*/Foomatic -%dir /usr/lib/cups -/usr/lib/cups/* +/usr/lib/cups/backend/* +/usr/lib/cups/driver/* +/usr/lib/cups/filter/* %{_mandir}/*/* %{_var}/cache/foomatic %changelog +* Tue Nov 10 2009 Tim Waugh 4.0.3-4 +- Require cups and don't own its directories (bug #534051). + * Sun Nov 8 2009 Tim Waugh 4.0.3-3 - Revert last change. From 9f2fbff025d9c2e3be35dec0390ccbab7ea4ae2b Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 10 Nov 2009 12:41:20 +0000 Subject: [PATCH 06/13] - Build requires cups. --- foomatic.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/foomatic.spec b/foomatic.spec index 55bdee8..b937bf1 100644 --- a/foomatic.spec +++ b/foomatic.spec @@ -4,7 +4,7 @@ Summary: Database of printers and printer drivers Name: foomatic Version: %{enginever} -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -36,6 +36,7 @@ BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: libxml2-devel BuildRequires: ghostscript-devel BuildRequires: autoconf, automake +BuildRequires: cups Requires: perl >= 3:5.8.1 Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)") BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -155,6 +156,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name} %{_var}/cache/foomatic %changelog +* Tue Nov 10 2009 Tim Waugh 4.0.3-5 +- Build requires cups. + * Tue Nov 10 2009 Tim Waugh 4.0.3-4 - Require cups and don't own its directories (bug #534051). From aa3a74b0ef4c5f693a6bcb9519ee028a0b6999de Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:25 +0000 Subject: [PATCH 07/13] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c3f20c4..d932206 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: foomatic -# $Id: Makefile,v 1.1 2004/09/09 04:49:40 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:46:02 notting Exp $ NAME := foomatic SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From b5245c2ef75b9f1cd7b1e8a37f8b888c650b347d Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 26 Nov 2009 09:56:02 +0000 Subject: [PATCH 08/13] No longer need foomatic-db tarball. --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index 800f528..40233ce 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -df252272fd8f802c57650bbc059a0f42 foomatic-db-4.0-20090702.tar.gz fdb02175cc857f63bb06b25ac3b1658b foomatic-db-engine-4.0.3.tar.gz f2fb7c48cc6b1af6f76dd0529d6dbd98 foomatic-filters-4.0.3.tar.gz From aa8ac3c317633f3a1c51610aa530fc9d772231c0 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Fri, 4 Dec 2009 09:37:39 +0000 Subject: [PATCH 09/13] - Fixed installation path for perl module. --- foomatic-db-engine-perl.patch | 39 +++++++++++++++++++++++++++++++++++ foomatic.spec | 12 ++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 foomatic-db-engine-perl.patch diff --git a/foomatic-db-engine-perl.patch b/foomatic-db-engine-perl.patch new file mode 100644 index 0000000..4453c03 --- /dev/null +++ b/foomatic-db-engine-perl.patch @@ -0,0 +1,39 @@ +diff -up foomatic-db-engine-4.0.3/configure.ac.perl foomatic-db-engine-4.0.3/configure.ac +--- foomatic-db-engine-4.0.3/configure.ac.perl 2009-12-04 09:26:14.236782616 +0000 ++++ foomatic-db-engine-4.0.3/configure.ac 2009-12-04 09:29:08.819781206 +0000 +@@ -184,13 +184,13 @@ else + PREFIX=$prefix + fi + echo -n Checking whether Perl will find libraries installed under $PREFIX... +-if ( $PERL -V | egrep "^ *$PREFIX/lib(/perl[[0-9]]?|)(/site_perl|)/[[0-9]]" > /dev/null); then ++if ( $PERL -V | egrep "^ *$PREFIX/lib(/perl[[0-9]]?|)(/site_perl|)" > /dev/null); then + PERLPREFIX=$PREFIX + echo " yes" + else + echo " no" + echo -n Checking whether Perl will find libraries installed under /usr/local... +- if ( $PERL -V | egrep "^ */usr/local/lib(/perl[[0-9]]?|)(/site_perl|)/[[0-9]]" > /dev/null); then ++ if ( $PERL -V | egrep "^ */usr/local/lib(/perl[[0-9]]?|)(/site_perl|)" > /dev/null); then + PERLPREFIX=/usr/local + echo " yes" + echo Installing the Perl libraries with prefix /usr/local. +diff -up foomatic-db-engine-4.0.3/configure.perl foomatic-db-engine-4.0.3/configure +--- foomatic-db-engine-4.0.3/configure.perl 2009-12-04 09:29:12.117906609 +0000 ++++ foomatic-db-engine-4.0.3/configure 2009-12-04 09:29:34.709782105 +0000 +@@ -4519,13 +4519,13 @@ else + PREFIX=$prefix + fi + echo -n Checking whether Perl will find libraries installed under $PREFIX... +-if ( $PERL -V | egrep "^ *$PREFIX/lib(/perl[0-9]?|)(/site_perl|)/[0-9]" > /dev/null); then ++if ( $PERL -V | egrep "^ *$PREFIX/lib(/perl[0-9]?|)(/site_perl|)" > /dev/null); then + PERLPREFIX=$PREFIX + echo " yes" + else + echo " no" + echo -n Checking whether Perl will find libraries installed under /usr/local... +- if ( $PERL -V | egrep "^ */usr/local/lib(/perl[0-9]?|)(/site_perl|)/[0-9]" > /dev/null); then ++ if ( $PERL -V | egrep "^ */usr/local/lib(/perl[0-9]?|)(/site_perl|)" > /dev/null); then + PERLPREFIX=/usr/local + echo " yes" + echo Installing the Perl libraries with prefix /usr/local. +diff -up foomatic-db-engine-4.0.3/Makefile.in.perl foomatic-db-engine-4.0.3/Makefile.in diff --git a/foomatic.spec b/foomatic.spec index b937bf1..6553419 100644 --- a/foomatic.spec +++ b/foomatic.spec @@ -4,7 +4,7 @@ Summary: Database of printers and printer drivers Name: foomatic Version: %{enginever} -Release: 5%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -28,6 +28,9 @@ 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 @@ -79,6 +82,7 @@ pushd foomatic-db-engine-%{enginever} chmod a+x mkinstalldirs %patch101 -p1 -b .libdir %patch102 -p1 +%patch103 -p1 -b .perl aclocal autoconf popd @@ -156,6 +160,12 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name} %{_var}/cache/foomatic %changelog +* Fri Dec 4 2009 Tim Waugh - 4.0.3-7 +- Fixed installation path for perl module. + +* Fri Dec 4 2009 Stepan Kasal - 4.0.3-6 +- rebuild against perl 5.10.1 + * Tue Nov 10 2009 Tim Waugh 4.0.3-5 - Build requires cups. From b8a26ebb49b217da3baf565b66121f807388d047 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 19 Jan 2010 17:01:22 +0000 Subject: [PATCH 10/13] - Fix for handling integer options (bug #531278). --- foomatic-filters-int-options.patch | 13 +++++++++++++ foomatic.spec | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 foomatic-filters-int-options.patch diff --git a/foomatic-filters-int-options.patch b/foomatic-filters-int-options.patch new file mode 100644 index 0000000..220d36c --- /dev/null +++ b/foomatic-filters-int-options.patch @@ -0,0 +1,13 @@ +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; + } diff --git a/foomatic.spec b/foomatic.spec index 6553419..af2bd7a 100644 --- a/foomatic.spec +++ b/foomatic.spec @@ -4,7 +4,7 @@ Summary: Database of printers and printer drivers Name: foomatic Version: %{enginever} -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -20,6 +20,9 @@ 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. @@ -73,6 +76,7 @@ The site http://www.linuxprinting.org/ is based on this database. pushd foomatic-filters-%{filtersver} %patch1 -p1 -b .libdir %patch2 -p1 -b .mkstemp +%patch3 -p1 -b .int-options aclocal automake autoconf @@ -160,6 +164,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name} %{_var}/cache/foomatic %changelog +* Tue Jan 19 2010 Tim Waugh - 4.0.3-8 +- Fix for handling integer options (bug #531278). + * Fri Dec 4 2009 Tim Waugh - 4.0.3-7 - Fixed installation path for perl module. From 580f6a09de3604235cc4721aee3e69c3514810dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Tue, 16 Feb 2010 13:54:22 +0000 Subject: [PATCH 11/13] - 4.0.4 - build no more requires ghostscript-devel - removed foomatic-filters-int-options.patch --- .cvsignore | 2 ++ foomatic-filters-int-options.patch | 13 ------------- foomatic-mkstemp.patch | 24 ++++++++++-------------- foomatic.spec | 18 +++++++++--------- sources | 4 ++-- 5 files changed, 23 insertions(+), 38 deletions(-) delete mode 100644 foomatic-filters-int-options.patch diff --git a/.cvsignore b/.cvsignore index 3871aed..4a7ae14 100644 --- a/.cvsignore +++ b/.cvsignore @@ -79,3 +79,5 @@ 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 +foomatic-db-engine-4.0.4.tar.gz +foomatic-filters-4.0.4.tar.gz diff --git a/foomatic-filters-int-options.patch b/foomatic-filters-int-options.patch deleted file mode 100644 index 220d36c..0000000 --- a/foomatic-filters-int-options.patch +++ /dev/null @@ -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; - } diff --git a/foomatic-mkstemp.patch b/foomatic-mkstemp.patch index 441b8ea..3543d17 100644 --- a/foomatic-mkstemp.patch +++ b/foomatic-mkstemp.patch @@ -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.mkstemp foomatic-filters-4.0.2/pdf.c - 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); diff --git a/foomatic.spec b/foomatic.spec index af2bd7a..e6db40e 100644 --- a/foomatic.spec +++ b/foomatic.spec @@ -1,16 +1,16 @@ -%define enginever 4.0.3 -%define filtersver 4.0.3 +%define enginever 4.0.4 +%define filtersver 4.0.4 Summary: Database of printers and printer drivers Name: foomatic Version: %{enginever} -Release: 8%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries 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) @@ -20,9 +20,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. @@ -40,7 +37,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 BuildRequires: cups Requires: perl >= 3:5.8.1 @@ -76,7 +72,6 @@ The site http://www.linuxprinting.org/ is based on this database. pushd foomatic-filters-%{filtersver} %patch1 -p1 -b .libdir %patch2 -p1 -b .mkstemp -%patch3 -p1 -b .int-options aclocal automake autoconf @@ -164,6 +159,11 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name} %{_var}/cache/foomatic %changelog +* Tue Feb 16 2010 Jiri Popelka - 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 - 4.0.3-8 - Fix for handling integer options (bug #531278). diff --git a/sources b/sources index 40233ce..c665d31 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -fdb02175cc857f63bb06b25ac3b1658b foomatic-db-engine-4.0.3.tar.gz -f2fb7c48cc6b1af6f76dd0529d6dbd98 foomatic-filters-4.0.3.tar.gz +675999e0ab8d59ad34a805c378830354 foomatic-db-engine-4.0.4.tar.gz +f67fc793ee8d4d076c6671d6e6a72367 foomatic-filters-4.0.4.tar.gz From ef407fe4548d5ffe4e8e04f7d75fe4b94d7ca6df Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 18 Mar 2010 12:05:06 +0000 Subject: [PATCH 12/13] - Package requires ghostscript (used by foomatic-rip). --- foomatic.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/foomatic.spec b/foomatic.spec index e6db40e..f9b6024 100644 --- a/foomatic.spec +++ b/foomatic.spec @@ -4,7 +4,7 @@ Summary: Database of printers and printer drivers Name: foomatic Version: %{enginever} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -51,6 +51,7 @@ BuildRequires: mpage Requires: foomatic-db Requires: cups +Requires: ghostscript %description Foomatic is a comprehensive, spooler-independent database of printers, @@ -159,6 +160,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name} %{_var}/cache/foomatic %changelog +* Thu Mar 18 2010 Tim Waugh - 4.0.4-2 +- Package requires ghostscript (used by foomatic-rip). + * Tue Feb 16 2010 Jiri Popelka - 4.0.4-1 - 4.0.4 - build no more requires ghostscript-devel From f578d4429cda9a5351761b2a774ad28cf6371653 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 14:41:36 +0000 Subject: [PATCH 13/13] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d932206..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: foomatic -# $Id: Makefile,v 1.2 2007/10/15 18:46:02 notting Exp $ -NAME := foomatic -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12