diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index e3bee64..dc4da05 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,6 +1,6 @@ diff -up hplip-3.11.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.12/prnt/drv/hpcups.drv.in --- hplip-3.11.12/prnt/drv/hpcups.drv.in.deviceIDs-drv 2011-12-09 12:23:33.000000000 +0100 -+++ hplip-3.11.12/prnt/drv/hpcups.drv.in 2011-12-19 11:40:07.712689960 +0100 ++++ hplip-3.11.12/prnt/drv/hpcups.drv.in 2012-01-18 19:11:27.733181816 +0100 @@ -459,7 +459,7 @@ Manufacturer "HP" ModelName "HP Officejet v40xi" Attribute "NickName" "" "HP Officejet v40xi, $Version" @@ -639,6 +639,15 @@ diff -up hplip-3.11.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.12/prnt/d PCFileName "hp-laserjet_p2015_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p2015 Printer)" } +@@ -11143,7 +11144,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p2035" + Attribute "NickName" "" "HP LaserJet p2035 pcl3, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p2035" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P2035;" + PCFileName "hp-laserjet_p2035-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet p2035 Printer)" + } @@ -11183,7 +11184,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2100" Attribute "NickName" "" "HP LaserJet 2100, $Version" @@ -1566,6 +1575,15 @@ diff -up hplip-3.11.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.12/prnt/d PCFileName "hp-laserjet_m1319f_mfp.ppd" Attribute "Product" "" "(HP LaserJet m1319f Multifunction Printer)" } +@@ -14900,7 +14901,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p2035" + Attribute "NickName" "" "HP LaserJet p2035 zjs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p2035" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P2035;" + PCFileName "hp-laserjet_p2035-zjs.ppd" + Attribute "Product" "" "(HP LaserJet p2035 Printer)" + } @@ -15032,7 +15033,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet Professional m1212nf MFP" Attribute "NickName" "" "HP LaserJet Professional m1212nf MFP, $Version, requires proprietary plugin" diff --git a/hplip.spec b/hplip.spec index b0ca1d8..501a19a 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.11.12 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -151,28 +151,29 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ). %patch4 -p1 -b .no-asm # Corrected several IEEE 1284 Device IDs using foomatic data. -# LaserJet P1007 (bug #585272) -# LaserJet P1505 (bug #680951) # Color LaserJet CM1312nfi (bug #581005) # Color LaserJet 3800 (bug #581935) # Color LaserJet 2840 (bug #582215) # Color LaserJet CP1518ni (bug #613689) # Color LaserJet 2600n (bug #613712) -# LaserJet 4050 Series/4100 Series/2100 Series/4350/5100 Series/8000 Series -# P3005/P3010 Series/P4014/P4515 (bug #659039) # Color LaserJet 2500/3700/4550/4600/4650/4700/5550/CP1515n/CP2025n # CP3525/CP4520 Series/CM2320nf (bug #659040) # Color LaserJet CP2025dn (bug #651509) # Color LaserJet CM4730 MFP (bug #658831) # Color LaserJet CM3530 MFP (bug #659381) +# LaserJet 4050 Series/4100 Series/2100 Series/4350/5100 Series/8000 Series +# P3005/P3010 Series/P4014/P4515 (bug #659039) # LaserJet Professional P1606dn (bug #708472) # LaserJet Professional M1212nf MFP (bug #742490) -# Officejet 6300 series (bug #689378) # LaserJet M1536dnf MFP (bug #743915) -# PSC 1600 series (bug #743821) # LaserJet M1522nf MFP (bug #745498) # LaserJet M1319f MFP (bug #746614) # LaserJet M1120 MFP (bug #754139). +# LaserJet P1007 (bug #585272) +# LaserJet P1505 (bug #680951) +# LaserJet P2035 (Ubuntu #917703) +# PSC 1600 series (bug #743821) +# Officejet 6300 series (bug #689378) %patch5 -p1 -b .deviceIDs-drv chmod +x %{SOURCE2} mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs} @@ -518,6 +519,9 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Wed Jan 18 2012 Jiri Popelka 3.11.12-3 +- Added IEEE 1284 Device ID for LaserJet P2035. + * Wed Jan 11 2012 Tim Waugh 3.11.12-2 - When copying Device IDs from hpcups to hpijs, use ModelName as the key instead of ShortNickName (bug #651509 comment #7).