diff --git a/.cvsignore b/.cvsignore index 0ca0c36..b6f831d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -56,3 +56,4 @@ foomatic-filters-3.0-20080211.tar.gz foomatic-filters-3.0-20080507.tar.gz foomatic-db-engine-3.0-20080710.tar.gz foomatic-filters-3.0-20080710.tar.gz +foomatic-db-3.0-20080710.tar.gz diff --git a/foomatic-ieee1284.patch b/foomatic-ieee1284.patch deleted file mode 100644 index 1302d8b..0000000 --- a/foomatic-ieee1284.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- foomatic-db-20070614/db/source/printer/HP-PhotoSmart_380.xml.ieee1284 2007-06-14 11:55:00.000000000 +0100 -+++ foomatic-db-20070614/db/source/printer/HP-PhotoSmart_380.xml 2007-06-14 11:55:13.000000000 +0100 -@@ -24,7 +24,13 @@ - - - -- -+ -+ HP -+ Photosmart 380 series_BT -+ 385 -+ PCL,DW-PCL,DESKJET,DYN -+ -+ - A - hpijs - diff --git a/foomatic.spec b/foomatic.spec index dc8ea2a..eb9931f 100644 --- a/foomatic.spec +++ b/foomatic.spec @@ -1,4 +1,4 @@ -%define dbver 20080211 +%define dbver 20080710 %define enginever 3.0-20080710 %define filtersver 20080710 %define hpijsver 20080211 @@ -40,9 +40,6 @@ Patch14: foomatic-ampathxml.patch # Handle non-UTF-8 encodings in imported PPD files. Patch15: foomatic-bad-utf8.patch -# Missing IEEE 1284 IDs. -Patch16: foomatic-ieee1284.patch - Patch18: foomatic-sigpipe.patch Url: http://www.linuxprinting.org @@ -108,8 +105,6 @@ popd pushd foomatic-db-%{dbver} %patch7 -p1 -b .ppdload-ppd -%patch16 -p1 -b .ieee1284 - cd db/source # For gutenprint printers, use gutenprint-ijs-simplified.5.0. @@ -252,6 +247,7 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name} %changelog * Thu Jul 10 2008 Tim Waugh +- Updated db to 20080710. - Updated filters to 3.0-20080710. - Updated db-engine to 3.0-20080710. - Ship a defaultspooler file to avoid the need for spooler diff --git a/sources b/sources index 65c570e..05eef07 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -5d827cd3d95807c28609d49a5c412c29 foomatic-db-3.0-20080211.tar.gz 58bef426f769219592b6b0c81357a04a foomatic-db-hpijs-20080211.tar.gz cca75a1d1a189a2b816a0c20058e6aef foomatic-db-engine-3.0-20080710.tar.gz ddd20fc710fba33900df82b0b2b95d35 foomatic-filters-3.0-20080710.tar.gz +f959c63dface3453aa0918df3bf6f6a8 foomatic-db-3.0-20080710.tar.gz