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

Merge branch 'f20' into f21

Browse Source
This commit is contained in:
Tim Waugh 2014-11-04 11:17:37 +00:00
commit 6bb19f5994
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hplip-deviceIDs-drv.patch
View File

@ -1,6 +1,6 @@
diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/drv/hpcups.drv.in diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/drv/hpcups.drv.in
--- hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv 2014-10-07 10:56:09.000000000 +0200 --- hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv 2014-10-07 09:56:09.000000000 +0100
+++ hplip-3.14.10/prnt/drv/hpcups.drv.in 2014-10-07 15:57:42.392251535 +0200 +++ hplip-3.14.10/prnt/drv/hpcups.drv.in 2014-11-04 10:47:59.260551958 +0000
@@ -473,7 +473,7 @@ Manufacturer "HP" @@ -473,7 +473,7 @@ Manufacturer "HP"
ModelName "HP Officejet v40xi" ModelName "HP Officejet v40xi"
Attribute "NickName" "" "HP Officejet v40xi, hpcups $Version" Attribute "NickName" "" "HP Officejet v40xi, hpcups $Version"
@ -1613,6 +1613,15 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d
PCFileName "hp-laserjet_professional_p1102.ppd" PCFileName "hp-laserjet_professional_p1102.ppd"
Attribute "Product" "" "(HP LaserJet Professional p1102 Printer)" Attribute "Product" "" "(HP LaserJet Professional p1102 Printer)"
Attribute "Product" "" "(HP LaserJet Professional p1102s Printer)" Attribute "Product" "" "(HP LaserJet Professional p1102s Printer)"
@@ -17335,7 +17338,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet Professional m1132 MFP"
Attribute "NickName" "" "HP LaserJet Professional m1132 MFP, hpcups $Version, requires proprietary plugin"
Attribute "ShortNickName" "" "HP LJ Professional m1132 MFP"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional m1132 mfp;DES:hp laserjet professional m1132 mfp;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional m1132 mfp;DES:hp laserjet professional m1132 mfp;"
PCFileName "hp-laserjet_professional_m1132_mfp.ppd"
Attribute "Product" "" "(HP LaserJet Professional m1132 Multifunction Printer)"
Attribute "Product" "" "(HP LaserJet Professional m1132s Multifunction Printer)"
@@ -17376,7 +17379,7 @@ Group "RLT/HP Real Life Technologies" @@ -17376,7 +17379,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet Professional m1212nf MFP" ModelName "HP LaserJet Professional m1212nf MFP"
Attribute "NickName" "" "HP LaserJet Professional m1212nf MFP, hpcups $Version, requires proprietary plugin" Attribute "NickName" "" "HP LaserJet Professional m1212nf MFP, hpcups $Version, requires proprietary plugin"

11
hplip-deviceIDs-ppd.patch
View File

@ -592,3 +592,14 @@ diff -up hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd hpli
*Product: "(HP LaserJet P3015)" *Product: "(HP LaserJet P3015)"
*Product: "(Hewlett-Packard HP LaserJet P3015)" *Product: "(Hewlett-Packard HP LaserJet P3015)"
*Product: "(HP LaserJet P3011)" *Product: "(HP LaserJet P3011)"
diff -up hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz-deviceid hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd
--- hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz-deviceid 2014-11-04 09:41:13.200005393 +0000
+++ hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd 2014-11-04 09:42:13.168312042 +0000
@@ -82,6 +82,7 @@
*cupsManualCopies: False
*cupsLanguages: "en da de es fi fr it ja ko nb nl pt ru sv zh_CN zh_TW"
*cupsFilter: "application/vnd.cups-postscript 0 hpps"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 400 color M451dn;DES:HP LaserJet 400 color M451dn;"
*UIConstraints: *HPOption_Duplexer False *Duplex
*UIConstraints: *Duplex *HPOption_Duplexer False
*UIConstraints: *HPOption_Tray3 False *InputSlot Tray3

9
hplip.spec
View File

@ -7,7 +7,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.14.10 Version: 3.14.10
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Url: http://hplip.sourceforge.net/ Url: http://hplip.sourceforge.net/
@ -166,6 +166,7 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ).
# LaserJet Professional P1102w (bug #795958) # LaserJet Professional P1102w (bug #795958)
# Color LaserJet CM4540 MFP (bug #968177) # Color LaserJet CM4540 MFP (bug #968177)
# Color LaserJet cp4005 (bug #980976) # Color LaserJet cp4005 (bug #980976)
# HP LaserJet Professional M1132 MFP (bug #1158743)
%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}
@ -216,6 +217,7 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
# Designjet T770 (bug #747957) # Designjet T770 (bug #747957)
# Color LaserJet CM4540 MFP (bug #968177) # Color LaserJet CM4540 MFP (bug #968177)
# Color LaserJet cp4005 (bug #980976) # Color LaserJet cp4005 (bug #980976)
# HP LaserJet Color M451dn (bug #1159380)
for ppd_file in $(grep '^diff' %{PATCH14} | cut -d " " -f 4); for ppd_file in $(grep '^diff' %{PATCH14} | cut -d " " -f 4);
do do
gunzip ${ppd_file#*/}.gz gunzip ${ppd_file#*/}.gz
@ -493,6 +495,11 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Tue Nov 4 2014 Tim Waugh <twaugh@redhat.com> - 3.14.10-3
- IEEE 1284 Device ID for HP LaserJet Professional M1132 MFP
(bug #1158743 comment #5).
- IEEE 1284 Device ID for HP LaserJet Color M451dn (bug #1159380).
* Fri Oct 31 2014 Tim Waugh <twaugh@redhat.com> - 3.14.10-2 * Fri Oct 31 2014 Tim Waugh <twaugh@redhat.com> - 3.14.10-2
- Fixed incorrect name in function call in makeURI when a parallel - Fixed incorrect name in function call in makeURI when a parallel
port device is used (bug #1159161). port device is used (bug #1159161).