- Added/Corrected several IEEE 1284 Device IDs (bugs #577262, #577282,

#577282, #577288, #577292, #577302, ,#577306, #577308, #577898, #579920, #580231)
2010-04-09 12:25:35 +00:00 · 2010-04-09 12:25:35 +00:00 · 753019cf43
commit 753019cf43
parent 728e3ff4b5
4 changed files with 381 additions and 185 deletions
--- a/hplip-deviceIDs-drv.patch
+++ b/hplip-deviceIDs-drv.patch
--- a/hplip-deviceIDs-ppd.patch
+++ b/hplip-deviceIDs-ppd.patch
@ -0,0 +1,143 @@
+diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd
+--- hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd	2010-04-01 15:37:01.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd	2010-04-01 15:41:31.000000000 +0200
+@@ -56,6 +56,7 @@
+ *Product: "(HP LaserJet 1200)"
+ *Product: "(Hewlett-Packard HP LaserJet 1200)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd
+--- hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd	2010-04-01 15:37:11.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd	2010-04-01 15:40:52.000000000 +0200
+@@ -56,6 +56,7 @@
+ *Product: "(HP LaserJet 1200)"
+ *Product: "(Hewlett-Packard HP LaserJet 1200)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd
+--- hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd	2010-04-08 17:44:22.000000000 +0200
+@@ -57,6 +57,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
+ *Product: "(HP LaserJet 1320 series)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd
+--- hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd	2010-04-08 17:44:38.000000000 +0200
+@@ -57,6 +57,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
+ *Product: "(HP LaserJet 1320 series)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd
+--- hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd	2010-04-08 17:44:43.000000000 +0200
+@@ -57,6 +57,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
+ *Product: "(HP LaserJet 1320 series)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd
+--- hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd	2010-04-08 17:44:48.000000000 +0200
+@@ -57,6 +57,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
+ *Product: "(HP LaserJet 1320 series)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd
+--- hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd	2010-04-08 17:44:53.000000000 +0200
+@@ -57,6 +57,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
+ *Product: "(HP LaserJet 1320 series)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd
+--- hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd	2010-04-01 15:38:23.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd	2010-04-01 15:39:35.000000000 +0200
+@@ -61,6 +61,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 2300L)"
+ *Product: "(HP LaserJet 2300L)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series"
+ *PSVersion: "(3010.107) 0"
+ 
+ *%=================================================
+diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd
+--- hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd	2010-04-01 15:38:36.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd	2010-04-01 15:39:58.000000000 +0200
+@@ -61,6 +61,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 2300L)"
+ *Product: "(HP LaserJet 2300L)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series"
+ *PSVersion: "(3010.107) 0"
+ 
+ *%=================================================
+diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd
+--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd	2010-04-08 17:45:10.000000000 +0200
+@@ -64,6 +64,7 @@
+ *Product: "(HP LaserJet P2015 Series)"
+ *Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;"
+ *PSVersion: "(3010.107) 0"
+ 
+ *%=================================================
+diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd
+--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd	2010-04-08 17:45:15.000000000 +0200
+@@ -64,6 +64,7 @@
+ *Product: "(HP LaserJet P2015 Series)"
+ *Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;"
+ *PSVersion: "(3010.107) 0"
+ 
+ *%=================================================
+diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd
+--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd	2010-04-08 17:45:19.000000000 +0200
+@@ -64,6 +64,7 @@
+ *Product: "(HP LaserJet P2015 Series)"
+ *Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;"
+ *PSVersion: "(3010.107) 0"
+ 
+ *%=================================================
+diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd
+--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd	2010-04-08 17:45:25.000000000 +0200
+@@ -64,6 +64,7 @@
+ *Product: "(HP LaserJet P2015 Series)"
+ *Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;"
+ *PSVersion: "(3010.107) 0"
+ 
+ *%=================================================
--- a/hplip-laserjet_2300-deviceID.patch
+++ b/hplip-laserjet_2300-deviceID.patch
@ -1,22 +0,0 @@
-diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.laserjet_2300-deviceID hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.laserjet_2300-deviceID	2010-03-26 16:14:32.000000000 +0100
-+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd	2010-03-26 16:16:30.000000000 +0100
-@@ -61,6 +61,7 @@
- *Product: "(Hewlett-Packard hp LaserJet 2300L)"
- *Product: "(HP LaserJet 2300L)"
- *Manufacturer: "HP"
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series"
- *PSVersion: "(3010.107) 0"
- 
- *%=================================================
-diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.laserjet_2300-deviceID hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.laserjet_2300-deviceID	2010-03-26 16:14:35.000000000 +0100
-+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd	2010-03-26 16:16:38.000000000 +0100
-@@ -61,6 +61,7 @@
- *Product: "(Hewlett-Packard hp LaserJet 2300L)"
- *Product: "(HP LaserJet 2300L)"
- *Manufacturer: "HP"
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series"
- *PSVersion: "(3010.107) 0"
- 
- *%=================================================
--- a/hplip.spec
+++ b/hplip.spec
@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.2
-Release: 8.1%{?dist}
+Release: 9%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@ -18,7 +18,7 @@ Patch1: hplip-pstotiff-is-rubbish.patch
 Patch2: hplip-strstr-const.patch
 Patch3: hplip-ui-optional.patch
 Patch4: hplip-no-asm.patch
-Patch5: hplip-device-ids.patch
+Patch5: hplip-deviceIDs-drv.patch
 Patch6: hplip-mucks-with-spooldir.patch
 Patch7: hplip-udev-rules.patch
 Patch8: hplip-retry-open.patch
@ -27,7 +27,7 @@ Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
 Patch14: hplip-hpcups-sigpipe.patch
 Patch16: hplip-bad-low-ink-warning.patch
-Patch17: hplip-laserjet_2300-deviceID.patch
+Patch17: hplip-deviceIDs-ppd.patch

 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

@ -133,7 +133,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %patch4 -p1 -b .no-asm

 # Corrected several IEEE 1284 Device IDs using foomatic data.
-%patch5 -p1 -b .device-ids
+%patch5 -p1 -b .deviceIDs-drv

 # Stopped hpcups pointlessly trying to read spool files
 # directly (bug #552572).
@ -161,12 +161,20 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
 %patch16 -p1 -b .bad-low-ink-warning

-# Add Device ID for HP LaserJet 2300 (#576928)
-gunzip prnt/ps/hp-laserjet_2300-ps.ppd.gz
-gunzip prnt/ps/hp-laserjet_2300_series-ps.ppd.gz
-%patch17 -p1 -b .laserjet_2300-deviceID
-gzip -n prnt/ps/hp-laserjet_2300-ps.ppd
-gzip -n prnt/ps/hp-laserjet_2300_series-ps.ppd
+# Add Device ID for
+# HP LaserJet 1200 (bug #577308)
+# HP LaserJet 1320 series (bug #579920)
+# HP LaserJet 2300 (bug #576928)
+# HP LaserJet P2015 Series (bug #580231)
+for ppd_file in $(grep '^diff' ../hplip-deviceIDs-ppd.patch | cut -d " " -f 4);
+do
+  gunzip ${ppd_file#*/}.gz
+done
+%patch17 -p1 -b .deviceIDs-ppd
+for ppd_file in $(grep '^diff' ../hplip-deviceIDs-ppd.patch | cut -d " " -f 4);
+do
+  gzip -n ${ppd_file#*/}
+done

 sed -i.duplex-constraints \
    -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
@ -389,6 +397,11 @@ fi
 %{_bindir}/hpcups-update-ppds &>/dev/null ||:

 %changelog
+* Fri Apr  9 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.2-9
+- Added/Corrected several IEEE 1284 Device IDs
+  (bugs #577262, #577282, #577282, #577288, #577292, #577302,
+  ,#577306, #577308, #577898, #579920, #580231)
+
 * Wed Apr  7 2010 Tim Waugh <twaugh@redhat.com> - 3.10.2-8.1
 - Regenerate hpcups PPDs on upgrade if necessary (bug #579355).