[hplip/f14] Corrected IEEE 1284 Device ID for LaserJet M1522nf MFP (bug #745498).

[Tim Waugh]

commit 5e018681045e1eb3a19517b62aa929c973f65d55
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Oct 12 15:23:08 2011 +0100

    Corrected IEEE 1284 Device ID for LaserJet M1522nf MFP (bug #745498).

 hplip-deviceIDs-drv.patch |   11 ++++++++++-
 hplip.spec                |    6 +++++-
 2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch
index 10fd1c2..73ee399 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-07 15:10:17.251249460 +0100
++++ hplip-3.11.10/prnt/drv/hpcups.drv.in	2011-10-12 15:21:52.822645186 +0100
 @@ -458,7 +458,7 @@ Manufacturer "HP"
        ModelName "HP Officejet v40xi"
        Attribute "NickName" "" "HP Officejet v40xi, $Version"
@@ -612,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)"
+@@ -11018,7 +11019,7 @@ Group "RLT/HP Real Life Technologies"
+       ModelName "HP LaserJet m1522nf MFP"
+       Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, $Version"
+       Attribute "ShortNickName" "" "HP LaserJet m1522nf MFP"
+-      Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1522nf mfp;DES:hp laserjet m1522nf mfp;"
++      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1522nf mfp;DES:hewlett-packard laserjet m1522nf mfp;"
+       PCFileName "hp-laserjet_m1522nf_mfp-pcl3.ppd"
+       Attribute "Product" "" "(HP LaserJet m1522nf Multifunction Printer)"
+     }
 @@ -11026,7 +11027,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet m1536dnf MFP"
        Attribute "NickName" "" "HP LaserJet m1536dnf MFP pcl3, $Version"
diff --git a/hplip.spec b/hplip.spec
index 01f26fc..4889b79 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: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -172,6 +172,7 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ).
 # Officejet 6300 series (bug #689378)
 # LaserJet M1536dnf MFP (bug #743915)
 # PSC 1600 series (bug #743821)
+# LaserJet M1522nf MFP (bug #745498)
 %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 Oct 12 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-3
+- Corrected IEEE 1284 Device ID for LaserJet M1522nf MFP (bug #745498).
+
 * Fri Oct  7 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-2
 - Corrected IEEE 1284 Device IDs:
   - LaserJet M1536dnf MFP (bug #743915)