diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index 8f94f43..10fd1c2 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 05:11:24.000000000 +0200 -+++ hplip-3.11.10/prnt/drv/hpcups.drv.in 2011-10-04 15:48:54.881957881 +0200 +--- 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-07 15:10:17.251249460 +0100 @@ -458,7 +458,7 @@ Manufacturer "HP" ModelName "HP Officejet v40xi" Attribute "NickName" "" "HP Officejet v40xi, $Version" @@ -307,15 +307,6 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-business_inkjet_2280-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" -@@ -2508,7 +2508,7 @@ Manufacturer "HP" - ModelName "HP PSC 1600 Series" - Attribute "NickName" "" "HP PSC 1600 Series, $Version" - Attribute "ShortNickName" "" "HP PSC 1600 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1600 series;DES:psc 1600 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1600 series;DES:psc 1600 series;" - PCFileName "hp-psc_1600_series.ppd" - Attribute "Product" "" "(HP PSC 1600 All-in-one Printer)" - Attribute "Product" "" "(HP PSC 1603 All-in-one Printer)" @@ -2524,7 +2524,7 @@ Manufacturer "HP" ModelName "HP PSC 2200 Series" Attribute "NickName" "" "HP PSC 2200 Series, $Version" @@ -621,6 +612,15 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_1320.ppd" Attribute "Product" "" "(HP LaserJet 1320 Printer)" Attribute "Product" "" "(HP LaserJet 1320t Printer)" +@@ -11026,7 +11027,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet m1536dnf MFP" + Attribute "NickName" "" "HP LaserJet m1536dnf MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m1536dnf MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1536dnf mfp;DES:hp laserjet m1536dnf mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1536dnf mfp;DES:hp laserjet m1536dnf mfp;" + PCFileName "hp-laserjet_m1536dnf_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m1536dnf MFP)" + } @@ -11098,7 +11099,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p2015 Series" Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, $Version" diff --git a/hplip.spec b/hplip.spec index c3e14ba..9d0e525 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: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -171,6 +171,8 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ). # LaserJet Professional P1606dn (bug #708472) # LaserJet Professional M1212nf MFP (bug #742490) # Officejet 6300 series (bug #689378) +# LaserJet M1635dnf MFP (bug #743915) +# PSC 1600 series (bug #743821) %patch5 -p1 -b .deviceIDs-drv chmod +x %{SOURCE2} mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs} @@ -519,6 +521,11 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Fri Oct 7 2011 Tim Waugh 3.11.10-2 +- Corrected IEEE 1284 Device IDs: + - LaserJet M1635dnf MFP (bug #743915) + - PSC 1600 series (bug #743821) + * Tue Oct 04 2011 Jiri Popelka 3.11.10-1 - 3.11.10 - Use _cups_serverbin macro from cups-devel for where to put driver executables.