From af9e719ddd20abbe295512486e282cbd9dc8c6ec Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Apr 16 2007 17:24:47 +0000 Subject: - Fixed %prep (bug #208851). - Resolves: rhbz#208851 --- diff --git a/foomatic.spec b/foomatic.spec index f7f6f68..15d1cfa 100644 --- a/foomatic.spec +++ b/foomatic.spec @@ -102,12 +102,17 @@ popd pushd foomatic-db-%{dbver} %patch7 -p1 -b .ppdload-ppd +cd db/source + # For gutenprint printers, use gutenprint-ijs-simplified.5.0. perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.0<,' printer/*.xml -# Remove references to foo2zjs and foo2oak (bug #208851). -find printer -name '*.xml' |xargs grep -l 'foo2'|xargs rm -f -rm -f driver/foo2zjs.xml driver/foo2oak.xml opt/foo2zjs-* opt/foo2oak-* +# Remove references to foo2zjs, foo2oak and foo2hp (bug #208851). +for x in zjs oak hp +do + find printer -name '*.xml' |xargs grep -l "foo2${x}"|xargs rm -f + rm -f driver/foo2${x}.xml opt/foo2${x}-* +done # Same for m2300w/m2400w find printer -name '*.xml' |xargs grep -l 'm2[34]00w<'|xargs rm -f rm -f driver/m2300w.xml driver/m2400w.xml opt/m2300w-* @@ -242,6 +247,7 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name} %changelog * Mon Apr 16 2007 Tim Waugh +- Fixed %%prep (bug #208851). - Removed now-unused with_omni code. * Fri Mar 30 2007 Tim Waugh 3.0.2-46