rpms/foomatic/FC-6 foomatic.spec,1.149,1.150

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

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



Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/FC-6/foomatic.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- foomatic.spec	9 Jan 2007 12:23:10 -0000	1.149
+++ foomatic.spec	16 Apr 2007 17:28:30 -0000	1.150
@@ -8,7 +8,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    39.4%{?dist}
+Release:    39.5%{?dist}
 License:	GPL
 Group: System Environment/Libraries
 
@@ -130,12 +130,17 @@
       foomatic-3.0.2/foomatic-db-20061031/db/source/printer/$f.xml
   done
 
+cd db/source
+
 # For any remaining 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-*
@@ -282,6 +287,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-39.5
+- Fixed %%prep (bug #208851).
+
 * Tue Jan  9 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-39.4
 - Removed m2300w files (bug #203381).