diff --git a/.cvsignore b/.cvsignore index 52407e1..679fd03 100644 --- a/.cvsignore +++ b/.cvsignore @@ -4,3 +4,4 @@ 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 diff --git a/foomatic-db-engine-xml-cflags.patch b/foomatic-db-engine-xml-cflags.patch new file mode 100644 index 0000000..633bf01 --- /dev/null +++ b/foomatic-db-engine-xml-cflags.patch @@ -0,0 +1,11 @@ +--- foomatic-db-engine-3.0.2/Makefile.in.xml2 2004-09-24 09:00:41.126334697 +0100 ++++ foomatic-db-engine-3.0.2/Makefile.in 2004-09-24 09:09:37.677826957 +0100 +@@ -53,7 +53,7 @@ + ## C settings + CC=@CC@ + CFLAGS=@CFLAGS@ +-XML_CFLAGS=@XML_CPPFLAGS@ ++XML_CFLAGS=@XML_CFLAGS@ + XML_LIBS=@XML_LIBS@ + + ## Settings for Perl diff --git a/foomatic.spec b/foomatic.spec index c39e3cf..bc96096 100644 --- a/foomatic.spec +++ b/foomatic.spec @@ -1,5 +1,5 @@ %define dbver 20040712 -%define enginever 3.0.1 +%define enginever 3.0.2 %define filtersver 3.0.1 %define hpijsver 1.5-20040219 @@ -43,11 +43,8 @@ Patch8: foomatic-hplj5.patch # Don't break gimp-print driver Patch9: foomatic-printoutmode.patch -# Fix Omni PageSize problem (bug #115586). -Patch10: foomatic-db-engine-db-pm-omni-0.9.1.patch - -# Fix deprecated cast-as-lvalues. -Patch11: foomatic-3.0.1-lvalue.patch +# Fix 3.0.2 build. +Patch10: foomatic-db-engine-xml-cflags.patch # Add autodetect information for HP DJ 6122 (bug #124629). Patch12: foomatic-hpdj6122.patch @@ -111,9 +108,8 @@ pushd foomatic-db-engine-%{enginever} chmod a+x mkinstalldirs %patch2 -p1 -b .libdir %patch6 -p1 -b .ppdload -%patch10 -p1 -b .db-pm-omni-0.9.1 -%patch11 -p1 -b .lvalue %patch14 -p1 -b .ampathxml +%patch10 -p1 -b .xml-cflags ./make_configure popd @@ -265,6 +261,10 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name} %{_mandir}/*/* %changelog +* Fri Sep 24 2004 Tim Waugh +- Updated db-engine to 3.0.2. +- No longer need Omni PageSize patch or lvalue patch. + * Tue Aug 31 2004 Tim Waugh 3.0.1-11 - Add autodetect information for Brother HL-5050 (bug #131220). diff --git a/sources b/sources index 50a1e46..58c5504 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ 2422ebfd69519b2d1822fba4c76bbb30 Omni-printers-0.9.1.tar.bz2 b4968c0846c5be3a995c4b5a76fc75e0 foomatic-db-20040712.tar.gz -89070d0acc245d350faeb0c49a5f3f7f foomatic-db-engine-3.0.1.tar.gz a968196fd540be53200220a785c2c518 foomatic-db-hpijs-1.5-20040219.tar.gz afa2bfcee2661252ec56af5616017d1e foomatic-filters-3.0.1.tar.gz e5cac8f30f0c39b576c1a25008a06198 gimp-print-foomatic-db-4.2.7.tar.bz2 +3061b8d3f7870467e6fbeae8d4399211 foomatic-db-engine-3.0.2.tar.gz