diff --git a/foomatic.spec b/foomatic.spec
index dd782ea..c1725a8 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -115,16 +115,23 @@ pushd foomatic-db-%{dbver}
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,^.*printer/\(.*\).*$,\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 'foo2'|xargs rm -f
@@ -273,6 +280,7 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
%changelog
* Tue Nov 7 2006 Tim Waugh
+- Clean up gimp-print-ijs/gutenprint recommended drivers.
- Updated db-hpijs to 20061031.
* Fri Nov 3 2006 Tim Waugh 3.0.2-39