rpms/foomatic/FC-6 foomatic.spec,1.144,1.145

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	foomatic.spec 
Log Message:
* Tue Nov  7 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-38.2
- Clean up gimp-print-ijs/gutenprint recommended drivers.


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/FC-6/foomatic.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- foomatic.spec	7 Nov 2006 13:01:03 -0000	1.144
+++ foomatic.spec	7 Nov 2006 16:47:44 -0000	1.145
@@ -8,7 +8,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    38%{?dist}.1
+Release:    38%{?dist}.2
 License:	GPL
 Group: System Environment/Libraries
 
@@ -115,16 +115,23 @@
 tar xjf %{SOURCE4}
 %endif
 
-# Gimp-print-4.2.0 driver info
+# Gimp-print-4.2.7 driver info
 pushd db/source
 tar xjf %{SOURCE5}
 # Fix up 'gimp-print' references to point to 'gimp-print-ijs'.
 perl -pi -e 's,>gimp-print<,>gimp-print-ijs<,' printer/*.xml
 
-# Recommend gimp-print-ijs instead of gutenprint, just until it
-# gets into Core.  Anyway, there isn't a 'gutenprint' foomatic driver;
-# instead it's gutenprint-ijs.5.0 or gutenprint-ijs-simplified.5.0
-perl -pi -e 's,>gutenprint<,>gimp-print-ijs<,' printer/*.xml
+# Recommend gimp-print-ijs instead of gutenprint for each printer that
+# gimp-print-ijs can actually drive.
+sed -ne 's,^.*<id>printer/\(.*\)</id>.*$,\1,p' \
+  foomatic-3.0.2/foomatic-db-20061031/db/source/driver/gimp-print-ijs.xml |\
+  while read f; do
+    perl -pi -e 's,>gutenprint<,>gimp-print-ijs<,' \
+      foomatic-3.0.2/foomatic-db-20061031/db/source/printer/$f.xml
+  done
+
+# 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
@@ -272,7 +279,8 @@
 %{_var}/cache/foomatic
 
 %changelog
-* Tue Nov  7 2006 Tim Waugh <twaugh at redhat.com>
+* Tue Nov  7 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-38.2
+- Clean up gimp-print-ijs/gutenprint recommended drivers.
 - Updated db-hpijs to 20061031.
 
 * Fri Nov  3 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-38.1