From 4578e978a611758687da146c56f1404414bd2652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= <jpopelka@fedoraproject.org>
Date: Wed, 12 May 2010 10:27:29 +0000
Subject: [PATCH] - Added/corrected more IEEE 1284 Device IDs: - HP LaserJet
 4250 (bug #585499). - HP Color LaserJet 2605dn (bug #583953). - HP LaserJet
 P1007 (bug #585272).

---
 hplip-deviceIDs-drv.patch |  9 +++++++++
 hplip-deviceIDs-ppd.patch | 22 ++++++++++++++++++++++
 hplip.spec                | 11 ++++++++++-
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch
index adb7b17..a34e93d 100644
--- a/hplip-deviceIDs-drv.patch
+++ b/hplip-deviceIDs-drv.patch
@@ -1350,3 +1350,12 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv
        PCFileName "hp-laserjet_p1006.ppd"
        Attribute "Product" "" "(HP LaserJet p1006 Printer)"
      }
+@@ -13407,7 +13408,7 @@ Group "RLT/HP Real Life Technologies"
+       ModelName "HP LaserJet p1007"
+       Attribute "NickName" "" "HP LaserJet p1007, $Version, requires proprietary plugin"
+       Attribute "ShortNickName" "" "HP LaserJet p1007"
+-      Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1007;DES:hp laserjet p1007;"
++      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1007;DES:HP LaserJet P1007;"
+       PCFileName "hp-laserjet_p1007.ppd"
+       Attribute "Product" "" "(HP LaserJet p1007 Printer)"
+     }
diff --git a/hplip-deviceIDs-ppd.patch b/hplip-deviceIDs-ppd.patch
index 971db2e..a3e9671 100644
--- a/hplip-deviceIDs-ppd.patch
+++ b/hplip-deviceIDs-ppd.patch
@@ -1,3 +1,25 @@
+diff -up hplip-3.10.2/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_4250-ps.ppd
+--- hplip-3.10.2/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd	2010-05-12 11:56:17.000000000 +0200
++++ hplip-3.10.2/prnt/ps/hp-laserjet_4250-ps.ppd	2010-05-12 11:58:30.000000000 +0200
+@@ -53,6 +53,7 @@
+ *HPPDEPanel: "HPImagingOptions"
+ 
+ *% Product Version Information
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4250;DES:Hewlett-Packard LaserJet 4250;"
+ *Product: "(hp LaserJet 4250)"
+ *Product: "(Hewlett-Packard hp LaserJet 4250)"
+ *Product: "(HP LaserJet 4250)"
+diff -up hplip-3.10.2/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-color_laserjet_2605dn-ps.ppd
+--- hplip-3.10.2/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd	2010-05-12 11:36:35.000000000 +0200
++++ hplip-3.10.2/prnt/ps/hp-color_laserjet_2605dn-ps.ppd	2010-05-12 11:39:06.000000000 +0200
+@@ -50,6 +50,7 @@
+ 
+ *% Product Name and Version Information
+ *Manufacturer:	"HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 2605dn;DES:Hewlett-Packard Color LaserJet 2605dn;"
+ *Product: "(HP Color LaserJet 2605)"
+ *Product: "(Hewlett-Packard HP Color LaserJet 2605)"
+ *Product: "(HP Color LaserJet 2605dn)"
 diff -up hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd
 --- hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd	2010-04-16 22:24:03.049147700 +0100
 +++ hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd	2010-04-16 22:25:34.077147648 +0100
diff --git a/hplip.spec b/hplip.spec
index 421526f..7a3bc46 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.2
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -140,6 +140,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # HP Color LaserJet CM1312nfi (bug #581005).
 # HP Color LaserJet 3800 (bug #581935).
 # HP Color LaserJet 2840 (bug #582215).
+# HP LaserJet P1007 (bug #585272).
 %patch5 -p1 -b .deviceIDs-drv
 
 # Stopped hpcups pointlessly trying to read spool files
@@ -178,6 +179,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # HP LaserJet P2015 Series (bug #580231)
 # HP Color LaserJet 3800 (bug #581935).
 # HP Color LaserJet 2840 (bug #582215).
+# HP LaserJet 4250 (bug #585499).
+# HP Color LaserJet 2605dn (bug #583953).
 for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4);
 do
   gunzip ${ppd_file#*/}.gz
@@ -418,6 +421,12 @@ fi
 %{_bindir}/hpcups-update-ppds &>/dev/null ||:
 
 %changelog
+* Wed May 12 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.2-15
+- Added/corrected more IEEE 1284 Device IDs:
+  - HP LaserJet 4250 (bug #585499).
+  - HP Color LaserJet 2605dn (bug #583953).
+  - HP LaserJet P1007 (bug #585272).
+
 * Wed May 12 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.2-14
 - Wait for max 30s to see if a system tray becomes available (bug #569969).