rpms/hplip/devel hplip-deviceIDs-drv.patch, 1.1, 1.2 hplip-deviceIDs-ppd.patch, 1.1, 1.2 hplip.spec, 1.271, 1.272
Tim Waugh
twaugh at fedoraproject.org
Fri Apr 16 21:43:31 UTC 2010
Author: twaugh
Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5119
Modified Files:
hplip-deviceIDs-drv.patch hplip-deviceIDs-ppd.patch hplip.spec
Log Message:
* Fri Apr 16 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-11
- Added/corrected more IEEE 1284 Device IDs:
- HP Color LaserJet CM1312nfi (bug #581005).
- HP Color LaserJet 3800 (bug #581935).
- HP Color LaserJet 2840 (bug #582215).
- HP PSC 2400 (bug #583103).
hplip-deviceIDs-drv.patch:
hpcups.drv.in | 299 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 150 insertions(+), 149 deletions(-)
Index: hplip-deviceIDs-drv.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-deviceIDs-drv.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-deviceIDs-drv.patch 9 Apr 2010 12:25:34 -0000 1.1
+++ hplip-deviceIDs-drv.patch 16 Apr 2010 21:43:31 -0000 1.2
@@ -1,6 +1,6 @@
diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv/hpcups.drv.in
---- hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-02-25 00:09:42.000000000 +0100
-+++ hplip-3.10.2/prnt/drv/hpcups.drv.in 2010-04-09 11:09:10.000000000 +0200
+--- hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-02-24 23:09:42.000000000 +0000
++++ hplip-3.10.2/prnt/drv/hpcups.drv.in 2010-04-16 22:20:26.664147525 +0100
@@ -421,7 +421,7 @@ Manufacturer "HP"
ModelName "HP Officejet v40xi"
Attribute "NickName" "" "HP Officejet v40xi, $Version"
@@ -348,7 +348,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
Attribute "NickName" "" "HP PSC 2400 Series, $Version"
Attribute "ShortNickName" "" "HP PSC 2400 Series"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2400 series;DES:psc 2400 series;"
-+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2400 Series;DES:psc 2400 series;"
++ Attribute "1284DeviceID" "" "MFG:hp;MDL:psc 2400 series;"
PCFileName "hp-psc_2400_series.ppd"
Attribute "Product" "" "(HP PSC 2405 Photosmart All-in-one Printer)"
Attribute "Product" "" "(HP PSC 2410xi Photosmart All-in-one Printer)"
@@ -918,6 +918,15 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_8150_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 8150 Printer)"
Attribute "Product" "" "(HP LaserJet 8150n Printer)"
+@@ -10174,7 +10175,7 @@ Group "RLT/HP Real Life Technologies"
+ ModelName "HP Color LaserJet cm1312nfi MFP"
+ Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version"
+ Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312nfi mfp;DES:hp color laserjet cm1312nfi mfp;"
++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM1312nfi MFP;"
+ PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd"
+ Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)"
+ }
@@ -10238,7 +10239,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Business Inkjet 2300"
Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version"
@@ -932,7 +941,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet 3800"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3800;DES:hp color laserjet 3800;"
-+ Attribute "1284DeviceID" "" "MFG:HP;MDL:HP Color LaserJet 3800;DES:HP Color LaserJet 3800;"
++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;"
PCFileName "hp-color_laserjet_3800-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet 3800 Printer)"
Attribute "Product" "" "(HP Color LaserJet 3800n Printer)"
hplip-deviceIDs-ppd.patch:
hp-color_laserjet_2840-ps.ppd | 1 +
hp-color_laserjet_3800-ps.ppd | 1 +
hp-laserjet_1200-ps.ppd | 1 +
hp-laserjet_1200n-ps.ppd | 1 +
hp-laserjet_1320-ps.ppd | 1 +
hp-laserjet_1320_series-ps.ppd | 1 +
hp-laserjet_1320n-ps.ppd | 1 +
hp-laserjet_1320nw-ps.ppd | 1 +
hp-laserjet_1320tn-ps.ppd | 1 +
hp-laserjet_2300-ps.ppd | 1 +
hp-laserjet_2300_series-ps.ppd | 1 +
hp-laserjet_p2015_series-ps.ppd | 1 +
hp-laserjet_p2015dn_series-ps.ppd | 1 +
hp-laserjet_p2015n_series-ps.ppd | 1 +
hp-laserjet_p2015x_series-ps.ppd | 1 +
15 files changed, 15 insertions(+)
Index: hplip-deviceIDs-ppd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-deviceIDs-ppd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-deviceIDs-ppd.patch 9 Apr 2010 12:25:34 -0000 1.1
+++ hplip-deviceIDs-ppd.patch 16 Apr 2010 21:43:31 -0000 1.2
@@ -1,6 +1,28 @@
+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
+@@ -46,6 +46,7 @@
+
+ *% Product Name and Version Information
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;CMD:PJL,PML,MLC,PCL,POSTSCRIPT,PCLXL;MDL:HP Color LaserJet 2840;DES:Hewlett-Packard Color LaserJet 2840;"
+ *Product: "(HP Color LaserJet 2820)"
+ *Product: "(Hewlett-Packard HP Color LaserJet 2820)"
+ *Product: "(HP Color LaserJet 2830)"
+diff -up hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd
+--- hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd 2010-04-16 22:22:28.705273898 +0100
++++ hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd 2010-04-16 22:23:28.914273477 +0100
+@@ -51,6 +51,7 @@
+
+ *% Product Name and Version Information
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;CMD:PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,POSTSCRIPT;"
+ *Product: "(HP Color LaserJet 3800)"
+ *Product: "(Hewlett-Packard HP Color LaserJet 3800)"
+ *ModelName: "HP Color LaserJet 3800"
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
+--- hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:53.000000000 +0000
++++ hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd 2010-04-16 22:21:49.286273004 +0100
@@ -56,6 +56,7 @@
*Product: "(HP LaserJet 1200)"
*Product: "(Hewlett-Packard HP LaserJet 1200)"
@@ -10,8 +32,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserje
*%=================================================
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
+--- hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:53.000000000 +0000
++++ hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd 2010-04-16 22:21:49.292272590 +0100
@@ -56,6 +56,7 @@
*Product: "(HP LaserJet 1200)"
*Product: "(Hewlett-Packard HP LaserJet 1200)"
@@ -21,8 +43,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserje
*%=================================================
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
+--- hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000
++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd 2010-04-16 22:21:49.300272653 +0100
@@ -57,6 +57,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1320 series)"
*Product: "(HP LaserJet 1320 series)"
@@ -32,8 +54,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserje
*%=================================================
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
+--- hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000
++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd 2010-04-16 22:21:49.304148148 +0100
@@ -57,6 +57,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1320 series)"
*Product: "(HP LaserJet 1320 series)"
@@ -43,8 +65,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserje
*%=================================================
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
+--- hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000
++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd 2010-04-16 22:21:49.317273026 +0100
@@ -57,6 +57,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1320 series)"
*Product: "(HP LaserJet 1320 series)"
@@ -54,8 +76,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserje
*%=================================================
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
+--- hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000
++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd 2010-04-16 22:21:49.321272466 +0100
@@ -57,6 +57,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1320 series)"
*Product: "(HP LaserJet 1320 series)"
@@ -65,8 +87,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserje
*%=================================================
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
+--- hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000
++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd 2010-04-16 22:21:49.334278100 +0100
@@ -57,6 +57,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1320 series)"
*Product: "(HP LaserJet 1320 series)"
@@ -76,8 +98,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserje
*%=================================================
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
+--- hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000
++++ hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd 2010-04-16 22:21:49.342272544 +0100
@@ -61,6 +61,7 @@
*Product: "(Hewlett-Packard hp LaserJet 2300L)"
*Product: "(HP LaserJet 2300L)"
@@ -87,8 +109,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserje
*%=================================================
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
+--- hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000
++++ hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd 2010-04-16 22:21:49.346272524 +0100
@@ -61,6 +61,7 @@
*Product: "(Hewlett-Packard hp LaserJet 2300L)"
*Product: "(HP LaserJet 2300L)"
@@ -98,8 +120,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserje
*%=================================================
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
+--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:55.000000000 +0000
++++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd 2010-04-16 22:21:49.356149235 +0100
@@ -64,6 +64,7 @@
*Product: "(HP LaserJet P2015 Series)"
*Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
@@ -109,8 +131,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserje
*%=================================================
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
+--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:55.000000000 +0000
++++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd 2010-04-16 22:21:49.367148274 +0100
@@ -64,6 +64,7 @@
*Product: "(HP LaserJet P2015 Series)"
*Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
@@ -120,8 +142,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserje
*%=================================================
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
+--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:55.000000000 +0000
++++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd 2010-04-16 22:21:49.376148194 +0100
@@ -64,6 +64,7 @@
*Product: "(HP LaserJet P2015 Series)"
*Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
@@ -131,8 +153,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserje
*%=================================================
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
+--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:55.000000000 +0000
++++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd 2010-04-16 22:21:49.386147840 +0100
@@ -64,6 +64,7 @@
*Product: "(HP LaserJet P2015 Series)"
*Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -p -r1.271 -r1.272
--- hplip.spec 16 Apr 2010 15:27:35 -0000 1.271
+++ hplip.spec 16 Apr 2010 21:43:31 -0000 1.272
@@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.10.2
-Release: 10%{?dist}
+Release: 11%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@@ -134,6 +134,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
%patch4 -p1 -b .no-asm
# Corrected several IEEE 1284 Device IDs using foomatic data.
+# HP Color LaserJet CM1312nfi (bug #581005).
+# HP Color LaserJet 3800 (bug #581935).
+# HP Color LaserJet 2840 (bug #582215).
%patch5 -p1 -b .deviceIDs-drv
# Stopped hpcups pointlessly trying to read spool files
@@ -167,6 +170,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# HP LaserJet 1320 series (bug #579920)
# HP LaserJet 2300 (bug #576928)
# HP LaserJet P2015 Series (bug #580231)
+# HP Color LaserJet 3800 (bug #581935).
+# HP Color LaserJet 2840 (bug #582215).
for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4);
do
gunzip ${ppd_file#*/}.gz
@@ -401,6 +406,13 @@ fi
%{_bindir}/hpcups-update-ppds &>/dev/null ||:
%changelog
+* Fri Apr 16 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-11
+- Added/corrected more IEEE 1284 Device IDs:
+ - HP Color LaserJet CM1312nfi (bug #581005).
+ - HP Color LaserJet 3800 (bug #581935).
+ - HP Color LaserJet 2840 (bug #582215).
+ - HP PSC 2400 (bug #583103).
+
* Thu Apr 16 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.2-10
- Fixed black/blank lines in ljcolor hpcups output (bug #579461).
Work-around is to send entire blank raster lines instead of skipping them.
@@ -410,7 +422,7 @@ fi
(bugs #577262, #577282, #577282, #577288, #577292, #577302,
,#577306, #577308, #577898, #579920, #580231)
-* Wed Apr 7 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-8.1
+* Wed Apr 7 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-8
- Regenerate hpcups PPDs on upgrade if necessary (bug #579355).
* Fri Mar 26 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.2-6
More information about the scm-commits
mailing list