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-07 15:14:05 +01:00
commit 96cd1a1ed4
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
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 05:11:24.000000000 +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-04 15:48:54.881957881 +0200 +++ hplip-3.11.10/prnt/drv/hpcups.drv.in 2011-10-07 15:10:17.251249460 +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"
@ -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" PCFileName "hp-business_inkjet_2280-pcl3.ppd"
Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" Attribute "Product" "" "(HP Business Inkjet 2280 Printer)"
Attribute "Product" "" "(HP Business Inkjet 2280tn 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" @@ -2524,7 +2524,7 @@ Manufacturer "HP"
ModelName "HP PSC 2200 Series" ModelName "HP PSC 2200 Series"
Attribute "NickName" "" "HP PSC 2200 Series, $Version" 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" 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)"
@@ -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" @@ -11098,7 +11099,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet p2015 Series" ModelName "HP LaserJet p2015 Series"
Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, $Version" Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, $Version"

9
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: 1%{?dist} Release: 2%{?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
@ -171,6 +171,8 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ).
# LaserJet Professional P1606dn (bug #708472) # LaserJet Professional P1606dn (bug #708472)
# LaserJet Professional M1212nf MFP (bug #742490) # LaserJet Professional M1212nf MFP (bug #742490)
# Officejet 6300 series (bug #689378) # Officejet 6300 series (bug #689378)
# LaserJet M1635dnf MFP (bug #743915)
# PSC 1600 series (bug #743821)
%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}
@ -519,6 +521,11 @@ fi
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Fri Oct 7 2011 Tim Waugh <twaugh@redhat.com> 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 <jpopelka@redhat.com> 3.11.10-1 * Tue Oct 04 2011 Jiri Popelka <jpopelka@redhat.com> 3.11.10-1
- 3.11.10 - 3.11.10
- Use _cups_serverbin macro from cups-devel for where to put driver executables. - Use _cups_serverbin macro from cups-devel for where to put driver executables.