From 196ad42e541e642bc7996e64230d7f1389b677d9 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Thu, 17 Jan 2013 12:19:55 +0100
Subject: [PATCH] Added IEEE 1284 Device ID for Kyocera FS-1118MFP (bug
 #782379).

---
 gutenprint-device-ids.patch | 15 ++++++++++++---
 gutenprint.spec             |  6 +++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/gutenprint-device-ids.patch b/gutenprint-device-ids.patch
index 30a1f19..86de21f 100644
--- a/gutenprint-device-ids.patch
+++ b/gutenprint-device-ids.patch
@@ -1,6 +1,6 @@
-diff -up gutenprint-5.2.8/src/xml/printers.xml.device-ids gutenprint-5.2.8/src/xml/printers.xml
---- gutenprint-5.2.8/src/xml/printers.xml.device-ids	2012-05-31 02:57:53.000000000 +0200
-+++ gutenprint-5.2.8/src/xml/printers.xml	2012-06-12 10:03:16.344274655 +0200
+diff -up gutenprint-5.2.9/src/xml/printers.xml.device-ids gutenprint-5.2.9/src/xml/printers.xml
+--- gutenprint-5.2.9/src/xml/printers.xml.device-ids	2012-05-31 02:57:53.000000000 +0200
++++ gutenprint-5.2.9/src/xml/printers.xml	2013-01-17 12:12:42.448745262 +0100
 @@ -149,16 +149,16 @@
        <printer translate="name" name="Canon PIXMA iP100" driver="bjc-PIXMA-iP100" manufacturer="Canon" model="3000100" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP100" />
        <printer translate="name" name="Canon PIXMA iP2000" driver="bjc-PIXMA-iP2000" manufacturer="Canon" model="3002000" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP2000" />
@@ -147,3 +147,12 @@ diff -up gutenprint-5.2.8/src/xml/printers.xml.device-ids gutenprint-5.2.8/src/x
        <printer translate="name" name="HP Mopier 240" driver="hp-mopier_240" manufacturer="HP" model="6" parameters="pcl_laser_params" foomaticid="HP-Mopier_240" />
        <printer translate="name" name="HP Mopier 320" driver="hp-mopier_320" manufacturer="HP" model="6" parameters="pcl_laser_params" foomaticid="HP-Mopier_320" />
        <printer translate="name" name="HP OfficeJet 300" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 300;DES:Hewlett-Packard OfficeJet Series 300;CMD:MLC,PCL,PML;" driver="hp-oj_300" manufacturer="HP" model="500" parameters="pcl_inkjet_params" foomaticid="HP-OfficeJet_300" />
+@@ -1384,7 +1386,7 @@
+       <printer translate="name" name="Kyocera FS-1020D" driver="kyocera-fs-1020d" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1020D" />
+       <printer translate="name" name="Kyocera FS-1030D" driver="kyocera-fs-1030d" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1030D" />
+       <printer translate="name" name="Kyocera FS-1050" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-1050;DES:Kyocera FS-1050;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1050" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1050" />
+-      <printer translate="name" name="Kyocera FS-1118MFP" driver="kyocera-fs-1118mfp" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1118MFP" />
++      <printer translate="name" name="Kyocera FS-1118MFP" deviceid="MFG:Kyocera;MDL:FS-1118MFP;CMD:PCLXL,PostScript Emulation,PCL5E,PJL;" driver="kyocera-fs-1118mfp" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1118MFP" />
+       <printer translate="name" name="Kyocera FS-1200" deviceid="MFG:Kyocera;MDL:Kyocera FS-1200;DES:Kyocera FS-1200;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1200" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1200" />
+       <printer translate="name" name="Kyocera FS-1600" deviceid="MFG:Kyocera;MDL:FS-1600;DES:Kyocera FS-1600;" driver="kyocera-fs-1600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1600" />
+       <printer translate="name" name="Kyocera FS-1600+" driver="kyocera-fs-1600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1600plus" />
diff --git a/gutenprint.spec b/gutenprint.spec
index bc4aee4..bc27666 100644
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@ -3,7 +3,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package
 Version:        5.2.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/gimp-print/gutenprint-%{version}.tar.bz2
@@ -171,6 +171,7 @@ Epson, HP and compatible printers.
 #  Brother hl-2035 (bug #651603#c3)
 #  Canon PIXMA MP250 (bug #744087).
 #  Canon PIXMA Pro9000mk2.
+#  Kyocera FS-1118MFP (bug #782379).
 %patch4 -p1 -b .device-ids
 # Fix build against new versions of gcc.
 
@@ -292,6 +293,9 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Thu Jan 17 2013 Jiri Popelka <jpopelka@redhat.com> 5.2.9-2
+- Added IEEE 1284 Device ID for Kyocera FS-1118MFP (bug #782379).
+
 * Mon Jul 09 2012 Jiri Popelka <jpopelka@redhat.com> 5.2.9-1
 - 5.2.9