From 095d3bc92eb170e0d45d925d477c5d23135b5375 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Mon, 17 Oct 2011 11:14:07 +0100
Subject: [PATCH] LaserJet M1319f MFP (bug #746614)

---
 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 73ee399..039835b 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-12 15:21:52.822645186 +0100
++++ hplip-3.11.10/prnt/drv/hpcups.drv.in	2011-10-17 11:12:10.322563171 +0100
 @@ -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)"
+@@ -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"
+       Attribute "ShortNickName" "" "HP LaserJet m1319f MFP"
+-      Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1319f mfp;DES:hp laserjet m1319f mfp;"
++      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1319f mfp;DES:hp laserjet m1319f mfp;"
+       PCFileName "hp-laserjet_m1319f_mfp.ppd"
+       Attribute "Product" "" "(HP LaserJet m1319f Multifunction Printer)"
+     }
 @@ -15001,7 +15002,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 4889b79..0eaa8e8 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: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -173,6 +173,7 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ).
 # LaserJet M1536dnf MFP (bug #743915)
 # PSC 1600 series (bug #743821)
 # LaserJet M1522nf MFP (bug #745498)
+# LaserJet M1319f MFP (bug #746614)
 %patch5 -p1 -b .deviceIDs-drv
 chmod +x %{SOURCE2}
 mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
@@ -519,6 +520,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Oct 17 2011 Tim Waugh <twaugh@redhat.com> 3.11.10-4
+- LaserJet M1319f MFP (bug #746614)
+
 * Wed Oct 12 2011 Tim Waugh <twaugh@redhat.com> 3.11.10-3
 - Corrected IEEE 1284 Device ID for LaserJet M1522nf MFP (bug #745498).