rpms/system-config-printer/F-13 system-config-printer-cdi-search-harder.patch, 1.1, 1.2 system-config-printer.spec, 1.380, 1.381

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9388

Modified Files:
	system-config-printer-cdi-search-harder.patch 
	system-config-printer.spec 
Log Message:
* Thu Mar 25 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-9
- Fixed cdi-search-harder patch.


system-config-printer-cdi-search-harder.patch:
 check-device-ids.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Index: system-config-printer-cdi-search-harder.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-13/system-config-printer-cdi-search-harder.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- system-config-printer-cdi-search-harder.patch	25 Mar 2010 16:33:49 -0000	1.1
+++ system-config-printer-cdi-search-harder.patch	25 Mar 2010 17:06:58 -0000	1.2
@@ -17,7 +17,7 @@ diff -up system-config-printer-1.2.0/che
 -            for each in missing:
 -                print "%s       MISSING  %s [%s]" % (more, each,
 -                                                     driver_uri_to_pkg (each))
-+            matches += set (bestmatches)
++            matches = matches.union (set (bestmatches))
 +
 +    missing = set (matches) - set (drivers)
 +    for each in missing:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-13/system-config-printer.spec,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -p -r1.380 -r1.381
--- system-config-printer.spec	25 Mar 2010 16:37:37 -0000	1.380
+++ system-config-printer.spec	25 Mar 2010 17:06:59 -0000	1.381
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.2.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -248,6 +248,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Mar 25 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-9
+- Fixed cdi-search-harder patch.
+
 * Thu Mar 25 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-8
 - Fixed traceback in asyncipp (bug #576932).
 - check-device-ids: search harder for missing Device IDs.