Add the patch.

This commit is contained in:
Tim Waugh 2010-03-25 17:15:40 +00:00
parent 6f1a5cd731
commit 43adcf4932
2 changed files with 19 additions and 2 deletions

View File

@ -0,0 +1,17 @@
diff -up system-config-printer-1.2.0/check-device-ids.py.cdi-lsb-paths system-config-printer-1.2.0/check-device-ids.py
--- system-config-printer-1.2.0/check-device-ids.py.cdi-lsb-paths 2010-03-25 17:06:01.198242692 +0000
+++ system-config-printer-1.2.0/check-device-ids.py 2010-03-25 17:07:10.914359770 +0000
@@ -116,6 +116,13 @@ makes = ppds.getMakes ()
def driver_uri_to_filename (uri):
schemeparts = uri.split (':', 2)
if len (schemeparts) < 2:
+ if uri.startswith ("lsb/usr/"):
+ return "/usr/share/ppd/" + uri[8:]
+ elif uri.startswith ("lsb/opt/"):
+ return "/opt/share/ppd/" + uri[8:]
+ elif uri.startswith ("lsb/local/"):
+ return "/usr/local/share/ppd/" + uri[10:]
+
return "/usr/share/cups/model/" + uri
scheme = schemeparts[0]

View File

@ -7,7 +7,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.2.0
Release: 9%{?dist}
Release: 9.1%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@ -252,7 +252,7 @@ rm -rf %buildroot
exit 0
%changelog
* Thu Mar 25 2010 Tim Waugh <twaugh@redhat.com> - 1.2.0-9
* Thu Mar 25 2010 Tim Waugh <twaugh@redhat.com> - 1.2.0-9.1
- check-device-ids: use correct paths for LSB model URIs.
- Fixed cdi-search-harder patch.