diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index 039835b..1ee7b30 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,6 +1,6 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/drv/hpcups.drv.in --- hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv 2011-10-02 04:11:24.000000000 +0100 -+++ hplip-3.11.10/prnt/drv/hpcups.drv.in 2011-10-17 11:12:10.322563171 +0100 ++++ hplip-3.11.10/prnt/drv/hpcups.drv.in 2011-11-16 16:08:55.497192996 +0000 @@ -458,7 +458,7 @@ Manufacturer "HP" ModelName "HP Officejet v40xi" Attribute "NickName" "" "HP Officejet v40xi, $Version" @@ -1548,6 +1548,15 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_1020.ppd" Attribute "Product" "" "(HP LaserJet 1020 Printer)" Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)" +@@ -14837,7 +14838,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet m1120 MFP" + Attribute "NickName" "" "HP LaserJet m1120 MFP, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet m1120 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1120 mfp;DES:hp laserjet m1120 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1120 mfp;DES:hp laserjet m1120 mfp;" + PCFileName "hp-laserjet_m1120_mfp.ppd" + Attribute "Product" "" "(HP LaserJet m1120 Multifunction Printer)" + } @@ -14853,7 +14854,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m1319f MFP" Attribute "NickName" "" "HP LaserJet m1319f MFP, $Version, requires proprietary plugin" diff --git a/hplip.spec b/hplip.spec index 3ae9d31..032c9ee 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.11.10 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -178,6 +178,7 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ). # PSC 1600 series (bug #743821) # LaserJet M1522nf MFP (bug #745498) # LaserJet M1319f MFP (bug #746614) +# LaserJet M1120 MFP (bug #754139). %patch5 -p1 -b .deviceIDs-drv chmod +x %{SOURCE2} mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs} @@ -535,6 +536,9 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Wed Nov 16 2011 Tim Waugh 3.11.10-10 +- Corrected IEEE 1284 Device ID for LaserJet M1120 MFP (bug #754139). + * Wed Nov 16 2011 Jiri Popelka 3.11.10-9 - revert prnt/hpcups/HPCupsFilter.cpp 3.11.5->3.11.7 change (bug #738089).