rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f14' into f15

Browse Source
This commit is contained in:
Tim Waugh 2011-10-12 15:25:01 +01:00
commit 204e2de910
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hplip-deviceIDs-drv.patch
View File

@ -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 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.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" @@ -458,7 +458,7 @@ Manufacturer "HP"
ModelName "HP Officejet v40xi" ModelName "HP Officejet v40xi"
Attribute "NickName" "" "HP Officejet v40xi, $Version" 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" PCFileName "hp-laserjet_1320.ppd"
Attribute "Product" "" "(HP LaserJet 1320 Printer)" Attribute "Product" "" "(HP LaserJet 1320 Printer)"
Attribute "Product" "" "(HP LaserJet 1320t 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" @@ -11026,7 +11027,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet m1536dnf MFP" ModelName "HP LaserJet m1536dnf MFP"
Attribute "NickName" "" "HP LaserJet m1536dnf MFP pcl3, $Version" Attribute "NickName" "" "HP LaserJet m1536dnf MFP pcl3, $Version"

6
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.11.10 Version: 3.11.10
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Group: System Environment/Daemons Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132 Conflicts: system-config-printer < 0.6.132
@ -173,6 +173,7 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ).
# Officejet 6300 series (bug #689378) # Officejet 6300 series (bug #689378)
# LaserJet M1536dnf MFP (bug #743915) # LaserJet M1536dnf MFP (bug #743915)
# PSC 1600 series (bug #743821) # PSC 1600 series (bug #743821)
# LaserJet M1522nf MFP (bug #745498)
%patch5 -p1 -b .deviceIDs-drv %patch5 -p1 -b .deviceIDs-drv
chmod +x %{SOURCE2} chmod +x %{SOURCE2}
mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs} mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
@ -521,6 +522,9 @@ fi
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Wed Oct 12 2011 Tim Waugh <twaugh@redhat.com> 3.11.10-3
- Corrected IEEE 1284 Device ID for LaserJet M1522nf MFP (bug #745498).
* Fri Oct 7 2011 Tim Waugh <twaugh@redhat.com> 3.11.10-2 * Fri Oct 7 2011 Tim Waugh <twaugh@redhat.com> 3.11.10-2
- Corrected IEEE 1284 Device IDs: - Corrected IEEE 1284 Device IDs:
- LaserJet M1536dnf MFP (bug #743915) - LaserJet M1536dnf MFP (bug #743915)