rpms/foomatic/devel foomatic.spec,1.153,1.154

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/foomatic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6496

Modified Files:
	foomatic.spec 
Log Message:
* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
- Fixed %prep (bug #208851).
- Resolves: rhbz#208851



Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- foomatic.spec	16 Apr 2007 16:58:50 -0000	1.153
+++ foomatic.spec	16 Apr 2007 17:24:47 -0000	1.154
@@ -102,12 +102,17 @@
 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 '<driver>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 "<driver>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 '<driver>m2[34]00w<'|xargs rm -f
 rm -f driver/m2300w.xml driver/m2400w.xml opt/m2300w-*
@@ -242,6 +247,7 @@
 
 %changelog
 * Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
+- Fixed %%prep (bug #208851).
 - Removed now-unused with_omni code.
 
 * Fri Mar 30 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-46