From 9a77696531e07aae83089384a5389be6f3ea8636 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Fri, 19 Mar 2010 13:50:45 +0000
Subject: [PATCH] - Device ID for Kyocera Mita FS-1020D (bug #575063).

---
 ...c-db-device-id-kyocera-mita-fs-1020d.patch | 90 +++++++++++++++++++
 foomatic-db.spec                              | 18 +++-
 2 files changed, 106 insertions(+), 2 deletions(-)
 create mode 100644 foomatic-db-device-id-kyocera-mita-fs-1020d.patch

diff --git a/foomatic-db-device-id-kyocera-mita-fs-1020d.patch b/foomatic-db-device-id-kyocera-mita-fs-1020d.patch
new file mode 100644
index 0000000..1492582
--- /dev/null
+++ b/foomatic-db-device-id-kyocera-mita-fs-1020d.patch
@@ -0,0 +1,90 @@
+diff -up foomatic-db-20100204/db/source/PPD/Kyocera/de/Kyocera_Mita_FS-1020D_de.ppd.device-id-kyocera-mita-fs-1020d foomatic-db-20100204/db/source/PPD/Kyocera/de/Kyocera_Mita_FS-1020D_de.ppd
+--- foomatic-db-20100204/db/source/PPD/Kyocera/de/Kyocera_Mita_FS-1020D_de.ppd.device-id-kyocera-mita-fs-1020d	2010-03-19 10:18:40.667621007 +0000
++++ foomatic-db-20100204/db/source/PPD/Kyocera/de/Kyocera_Mita_FS-1020D_de.ppd	2010-03-19 12:48:25.333620595 +0000
+@@ -88,7 +88,7 @@
+ *Protocols: PJL TBCP
+ 
+ *1284Modes Parallel: Compat Nibble ECP
+-*1284DeviceID: "MFG:Kyocera Mita;MODEL:Kyocera Mita FS-1020D;COMMAND SET: POSTSCRIPT,PJL,PCL"
++*1284DeviceID: "MFG:Kyocera;MDL:FS-1020D;CMD:PCLXL,PostScript Emulation,PCL5E,PJL;"
+ 
+ *% JCL Information 
+ *JCLBegin: "<1B>%-12345X@PJL JOB<0A>"
+diff -up foomatic-db-20100204/db/source/PPD/Kyocera/en/Kyocera_Mita_FS-1020D_en.ppd.device-id-kyocera-mita-fs-1020d foomatic-db-20100204/db/source/PPD/Kyocera/en/Kyocera_Mita_FS-1020D_en.ppd
+--- foomatic-db-20100204/db/source/PPD/Kyocera/en/Kyocera_Mita_FS-1020D_en.ppd.device-id-kyocera-mita-fs-1020d	2010-03-19 10:18:41.231620596 +0000
++++ foomatic-db-20100204/db/source/PPD/Kyocera/en/Kyocera_Mita_FS-1020D_en.ppd	2010-03-19 12:48:25.362620955 +0000
+@@ -88,7 +88,7 @@
+ *Protocols: PJL TBCP
+ 
+ *1284Modes Parallel: Compat Nibble ECP
+-*1284DeviceID: "MFG:Kyocera Mita;MODEL:Kyocera Mita FS-1020D;COMMAND SET: POSTSCRIPT,PJL,PCL"
++*1284DeviceID: "MFG:Kyocera;MDL:FS-1020D;CMD:PCLXL,PostScript Emulation,PCL5E,PJL;"
+ 
+ *% JCL Information 
+ *JCLBegin: "<1B>%-12345X@PJL JOB<0A>"
+diff -up foomatic-db-20100204/db/source/PPD/Kyocera/es/Kyocera_Mita_FS-1020D_es.ppd.device-id-kyocera-mita-fs-1020d foomatic-db-20100204/db/source/PPD/Kyocera/es/Kyocera_Mita_FS-1020D_es.ppd
+--- foomatic-db-20100204/db/source/PPD/Kyocera/es/Kyocera_Mita_FS-1020D_es.ppd.device-id-kyocera-mita-fs-1020d	2010-03-19 10:18:42.142622002 +0000
++++ foomatic-db-20100204/db/source/PPD/Kyocera/es/Kyocera_Mita_FS-1020D_es.ppd	2010-03-19 12:48:25.394621206 +0000
+@@ -88,7 +88,7 @@
+ *Protocols: PJL TBCP
+ 
+ *1284Modes Parallel: Compat Nibble ECP
+-*1284DeviceID: "MFG:Kyocera Mita;MODEL:Kyocera Mita FS-1020D;COMMAND SET: POSTSCRIPT,PJL,PCL"
++*1284DeviceID: "MFG:Kyocera;MDL:FS-1020D;CMD:PCLXL,PostScript Emulation,PCL5E,PJL;"
+ 
+ *% JCL Information 
+ *JCLBegin: "<1B>%-12345X@PJL JOB<0A>"
+diff -up foomatic-db-20100204/db/source/PPD/Kyocera/fr/Kyocera_Mita_FS-1020D_fr.ppd.device-id-kyocera-mita-fs-1020d foomatic-db-20100204/db/source/PPD/Kyocera/fr/Kyocera_Mita_FS-1020D_fr.ppd
+--- foomatic-db-20100204/db/source/PPD/Kyocera/fr/Kyocera_Mita_FS-1020D_fr.ppd.device-id-kyocera-mita-fs-1020d	2010-03-19 10:18:39.883623183 +0000
++++ foomatic-db-20100204/db/source/PPD/Kyocera/fr/Kyocera_Mita_FS-1020D_fr.ppd	2010-03-19 12:48:25.263620271 +0000
+@@ -88,7 +88,7 @@
+ *Protocols: PJL TBCP
+ 
+ *1284Modes Parallel: Compat Nibble ECP
+-*1284DeviceID: "MFG:Kyocera Mita;MODEL:Kyocera Mita FS-1020D;COMMAND SET: POSTSCRIPT,PJL,PCL"
++*1284DeviceID: "MFG:Kyocera;MDL:FS-1020D;CMD:PCLXL,PostScript Emulation,PCL5E,PJL;"
+ 
+ *% JCL Information 
+ *JCLBegin: "<1B>%-12345X@PJL JOB<0A>"
+diff -up foomatic-db-20100204/db/source/PPD/Kyocera/it/Kyocera_Mita_FS-1020D_it.ppd.device-id-kyocera-mita-fs-1020d foomatic-db-20100204/db/source/PPD/Kyocera/it/Kyocera_Mita_FS-1020D_it.ppd
+--- foomatic-db-20100204/db/source/PPD/Kyocera/it/Kyocera_Mita_FS-1020D_it.ppd.device-id-kyocera-mita-fs-1020d	2010-03-19 10:18:39.911620599 +0000
++++ foomatic-db-20100204/db/source/PPD/Kyocera/it/Kyocera_Mita_FS-1020D_it.ppd	2010-03-19 12:48:25.310621922 +0000
+@@ -88,7 +88,7 @@
+ *Protocols: PJL TBCP
+ 
+ *1284Modes Parallel: Compat Nibble ECP
+-*1284DeviceID: "MFG:Kyocera Mita;MODEL:Kyocera Mita FS-1020D;COMMAND SET: POSTSCRIPT,PJL,PCL"
++*1284DeviceID: "MFG:Kyocera;MDL:FS-1020D;CMD:PCLXL,PostScript Emulation,PCL5E,PJL;"
+ 
+ *% JCL Information 
+ *JCLBegin: "<1B>%-12345X@PJL JOB<0A>"
+diff -up foomatic-db-20100204/db/source/PPD/Kyocera/pt/Kyocera_Mita_FS-1020D_pt.ppd.device-id-kyocera-mita-fs-1020d foomatic-db-20100204/db/source/PPD/Kyocera/pt/Kyocera_Mita_FS-1020D_pt.ppd
+--- foomatic-db-20100204/db/source/PPD/Kyocera/pt/Kyocera_Mita_FS-1020D_pt.ppd.device-id-kyocera-mita-fs-1020d	2010-03-19 10:18:39.393747204 +0000
++++ foomatic-db-20100204/db/source/PPD/Kyocera/pt/Kyocera_Mita_FS-1020D_pt.ppd	2010-03-19 12:48:25.227621183 +0000
+@@ -88,7 +88,7 @@
+ *Protocols: PJL TBCP
+ 
+ *1284Modes Parallel: Compat Nibble ECP
+-*1284DeviceID: "MFG:Kyocera Mita;MODEL:Kyocera Mita FS-1020D;COMMAND SET: POSTSCRIPT,PJL,PCL"
++*1284DeviceID: "MFG:Kyocera;MDL:FS-1020D;CMD:PCLXL,PostScript Emulation,PCL5E,PJL;"
+ 
+ *% JCL Information 
+ *JCLBegin: "<1B>%-12345X@PJL JOB<0A>"
+diff -up foomatic-db-20100204/db/source/printer/Kyocera-FS-1020D.xml.device-id-kyocera-mita-fs-1020d foomatic-db-20100204/db/source/printer/Kyocera-FS-1020D.xml
+--- foomatic-db-20100204/db/source/printer/Kyocera-FS-1020D.xml.device-id-kyocera-mita-fs-1020d	2010-03-19 10:19:14.771753487 +0000
++++ foomatic-db-20100204/db/source/printer/Kyocera-FS-1020D.xml	2010-03-19 11:47:20.308749300 +0000
+@@ -19,10 +19,10 @@
+   </lang>
+   <autodetect>
+     <general>
+-      <ieee1284>MFG:Kyocera Mita;Model:Kyocera Mita FS-1020D;COMMAND SET: POSTSCRIPT,PJL,PCL</ieee1284>
+-      <commandset>POSTSCRIPT,PJL,PCL</commandset>
+-      <manufacturer>Kyocera Mita</manufacturer>
+-      <model>Kyocera Mita FS-1020D</model>
++      <ieee1284>MFG:Kyocera;MDL:FS-1020D;</ieee1284>
++      <commandset>PCLXL,PostScript Emulation,PCL5E,PJL</commandset>
++      <manufacturer>Kyocera</manufacturer>
++      <model>FS-1020D</model>
+     </general>
+   </autodetect>
+   <functionality>A</functionality>
diff --git a/foomatic-db.spec b/foomatic-db.spec
index feb1b07..ec9fd90 100644
--- a/foomatic-db.spec
+++ b/foomatic-db.spec
@@ -5,7 +5,7 @@
 Summary: Database of printers and printer drivers
 Name: foomatic-db
 Version: %{dbver_rel}
-Release: 10.%{dbver_snap}%{?dist}
+Release: 11.%{dbver_snap}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Requires: %{name}-filesystem = %{version}-%{release}
@@ -14,6 +14,8 @@ Requires: %{name}-ppds = %{version}-%{release}
 Source0: http://www.openprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
 Source1: http://www.openprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
 
+Patch1: foomatic-db-device-id-kyocera-mita-fs-1020d.patch
+
 Url: http://www.openprinting.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -61,7 +63,7 @@ find -type d | xargs chmod g-s
 
 pushd foomatic-db-%{dbver_snap}
 
-cd db/source
+pushd db/source
 
 # For gutenprint printers, use gutenprint-ijs-simplified.5.2.
 perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.2<,' printer/*.xml
@@ -89,6 +91,15 @@ find PPD -type f -name '*.ppd' | xargs perl -pi -e 's,perl -p,sed,'
 
 popd
 
+# foomatic-db patches
+# Don't use "-b" when patching PPD files as the backups will be
+# packaged.
+
+# Device ID for Kyocera Mita FS-1020D (bug #575063).
+%patch1 -p1
+
+popd
+
 %build
 pushd foomatic-db-hpijs-%{hpijsver}
 %configure
@@ -153,6 +164,9 @@ rm -rf %{buildroot}
 %{_datadir}/cups/model/foomatic-db-ppds
 
 %changelog
+* Fri Mar 19 2010 Tim Waugh <twaugh@redhat.com> 4.0-11.20100402
+- Device ID for Kyocera Mita FS-1020D (bug #575063).
+
 * Thu Feb  4 2010 Tim Waugh <twaugh@redhat.com> 4.0-10.20100402
 - Rebuild for postscriptdriver tags.