- check-device-ids: use make-and-model field for best-matching.

- Use upstream fix for async bugs.

system-config-printer-cdi-make-and-model.patch

@@ -0,0 +1,12 @@
+diff -up system-config-printer-1.2.0/check-device-ids.py.cdi-make-and-model system-config-printer-1.2.0/check-device-ids.py
+--- system-config-printer-1.2.0/check-device-ids.py.cdi-make-and-model	2010-03-27 10:16:04.371239756 +0000
++++ system-config-printer-1.2.0/check-device-ids.py	2010-03-27 10:16:14.458240137 +0000
+@@ -210,7 +210,7 @@ for device, attrs in devices.iteritems (
+             mdls = ppds.makes[make]
+             break
+     if mdls:
+-        (s, bestmatches) = ppds._findBestMatchPPDs (mdls, id_fields['MDL'])
++        (s, bestmatches) = ppds._findBestMatchPPDs (mdls, mdl)
+         if s == ppds.STATUS_SUCCESS:
+             matches = matches.union (set (bestmatches))
+ 

system-config-printer.spec

@@ -31,6 +31,7 @@ Patch11: system-config-printer-cdi-search-harder.patch
 Patch12: system-config-printer-asyncipp-traceback.patch
 Patch13: system-config-printer-cdi-lsb-paths.patch
 Patch14: system-config-printer-transience.patch
+Patch15: system-config-printer-cdi-make-and-model.patch
 
 Patch100: system-config-printer-pycups-build.patch
 
@@ -136,6 +137,9 @@ printers.
 # Fixed window transience for 'Change Device URI'.
 %patch14 -p1 -b .transience
 
+# check-device-ids: use make-and-model field for best-matching.
+%patch15 -p1 -b .cdi-make-and-model
+
 pushd pycups-%{pycups_version}
 
 # Fixed pycups build with new distutils.
@@ -259,6 +263,7 @@ exit 0
 
 %changelog
 * Sat Mar 27 2010 Tim Waugh <twaugh@redhat.com> - 1.2.0-12
+- check-device-ids: use make-and-model field for best-matching.
 - Use upstream fix for async bugs.
 
 * Fri Mar 26 2010 Tim Waugh <twaugh@redhat.com> - 1.2.0-11