diff --git a/system-config-printer-kyocera-mita.patch b/system-config-printer-kyocera-mita.patch new file mode 100644 index 0000000..160e2a7 --- /dev/null +++ b/system-config-printer-kyocera-mita.patch @@ -0,0 +1,39 @@ +diff -up system-config-printer-1.2.0/cupshelpers/ppds.py.kyocera-mita system-config-printer-1.2.0/cupshelpers/ppds.py +--- system-config-printer-1.2.0/cupshelpers/ppds.py.kyocera-mita 2010-03-09 17:52:15.000000000 +0000 ++++ system-config-printer-1.2.0/cupshelpers/ppds.py 2010-03-19 11:43:38.823746889 +0000 +@@ -137,6 +137,15 @@ def ppdMakeModelSplit (ppd_make_and_mode + elif l.startswith ("konica minolta "): + make = "KONICA MINOLTA" + model = ppd_make_and_model[15:] ++ elif l.startswith ("lexmark international "): ++ make = "Lexmark" ++ model = ppd_make_and_model[22:] ++ elif l.startswith ("kyocera mita "): ++ make = "Kyocera Mita" ++ model = ppd_make_and_model[13:] ++ elif l.startswith ("kyocera "): ++ make = "Kyocera Mita" ++ model = ppd_make_and_model[8:] + + # Finally, take the first word as the name of the manufacturer. + else: +@@ -156,9 +165,6 @@ def ppdMakeModelSplit (ppd_make_and_mode + makel.endswith ("packard")): + make = "HP" + makel = "hp" +- elif makel == "lexmark international": +- make = "Lexmark" +- makel = "lexmark" + + # HP PPDs give NickNames like: + # *NickName: "HP LaserJet 4 Plus v2013.111 Postscript (recommended)" +@@ -585,7 +591,8 @@ class PPDs: + mdll = mdl.lower () + + mfgrepl = {"hewlett-packard": "hp", +- "lexmark international": "lexmark"} ++ "lexmark international": "lexmark", ++ "kyocera": "kyocera mita"} + if self.lmakes.has_key (mfgl): + # Found manufacturer. + make = self.lmakes[mfgl] diff --git a/system-config-printer.spec b/system-config-printer.spec index c705c7d..11875b3 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -21,6 +21,7 @@ Patch1: system-config-printer-no-epydoc.patch Patch2: system-config-printer-lowercase-mfg-mdl.patch Patch3: system-config-printer-cdi-no-drivers.patch Patch4: system-config-printer-cdi-cmd.patch +Patch5: system-config-printer-kyocera-mita.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -92,6 +93,9 @@ printers. # Show CMD field in check-device-ids.py. %patch4 -p1 -b .cdi-cmd +# The canonical name for Kyocera is Kyocera Mita. +%patch5 -p1 -b .kyocera-mita + %build %configure --with-udev-rules @@ -208,6 +212,7 @@ exit 0 %changelog * Fri Mar 19 2010 Tim Waugh - 1.2.0-3 +- The canonical name for Kyocera is Kyocera Mita. - Show CMD field in check-device-ids.py. * Thu Mar 18 2010 Tim Waugh - 1.2.0-2