diff --git a/system-config-printer-cdi-lsb-paths.patch b/system-config-printer-cdi-lsb-paths.patch new file mode 100644 index 0000000..057c1cd --- /dev/null +++ b/system-config-printer-cdi-lsb-paths.patch @@ -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] diff --git a/system-config-printer.spec b/system-config-printer.spec index 16c6863..543ec57 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -29,6 +29,7 @@ Patch9: system-config-printer-JobCancel.patch Patch10: system-config-printer-inklevel.patch Patch11: system-config-printer-cdi-search-harder.patch Patch12: system-config-printer-asyncipp-traceback.patch +Patch13: system-config-printer-cdi-lsb-paths.patch Patch100: system-config-printer-pycups-build.patch @@ -126,6 +127,9 @@ printers. # Fixed traceback in asyncipp (bug #576932). %patch12 -p1 -b .cdi-search-harder +# check-device-ids: use correct paths for LSB model URIs. +%patch13 -p1 -b .cdi-lsb-paths + pushd pycups-%{pycups_version} # Fixed pycups build with new distutils. @@ -249,6 +253,7 @@ exit 0 %changelog * Thu Mar 25 2010 Tim Waugh - 1.2.0-9 +- check-device-ids: use correct paths for LSB model URIs. - Fixed cdi-search-harder patch. * Thu Mar 25 2010 Tim Waugh - 1.2.0-8