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

Merge branch 'f18' into f19

Browse Source
This commit is contained in:
Jiri Popelka 2013-05-10 17:09:40 +02:00
commit fab46fe76e
3 changed files with 38 additions and 4 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.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv/hpcups.drv.in diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv/hpcups.drv.in
--- hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv 2013-04-08 10:59:00.000000000 +0100 --- hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv 2013-04-08 11:59:00.000000000 +0200
+++ hplip-3.13.4/prnt/drv/hpcups.drv.in 2013-04-11 09:00:34.614513628 +0100 +++ hplip-3.13.4/prnt/drv/hpcups.drv.in 2013-05-10 16:55:10.144943059 +0200
@@ -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"
@ -657,6 +657,15 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
PCFileName "hp-laserjet_2100_series-pcl3.ppd" PCFileName "hp-laserjet_2100_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 2100 Series Printer)" Attribute "Product" "" "(HP LaserJet 2100 Series Printer)"
} }
@@ -12133,7 +12134,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 2200 Series"
Attribute "NickName" "" "HP LaserJet 2200 Series, hpcups $Version"
Attribute "ShortNickName" "" "HP LaserJet 2200 Series"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2200 series;DES:hp laserjet 2200 series;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;"
PCFileName "hp-laserjet_2200_series.ppd"
Attribute "Product" "" "(HP LaserJet 2200 Series Printer)"
}
@@ -12141,7 +12142,7 @@ Group "RLT/HP Real Life Technologies" @@ -12141,7 +12142,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 2200" ModelName "HP LaserJet 2200"
Attribute "NickName" "" "HP LaserJet 2200 pcl3, hpcups $Version" Attribute "NickName" "" "HP LaserJet 2200 pcl3, hpcups $Version"

22
hplip-deviceIDs-ppd.patch
View File

@ -338,6 +338,28 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd hplip
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;" +*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;"
*PSVersion: "(2014.111) 1" *PSVersion: "(2014.111) 1"
*%=================================================
diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2200-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_2200-ps.ppd
--- hplip-3.13.4/prnt/ps/hp-laserjet_2200-ps.ppd.deviceIDs-ppd 2013-05-10 17:02:26.193850985 +0200
+++ hplip-3.13.4/prnt/ps/hp-laserjet_2200-ps.ppd 2013-05-10 17:01:12.961873869 +0200
@@ -54,6 +54,7 @@
*Product: "(HP LaserJet 2200)"
*Product: "(Hewlett-Packard HP LaserJet 2200)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2200_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_2200_series-ps.ppd
--- hplip-3.13.4/prnt/ps/hp-laserjet_2200_series-ps.ppd.deviceIDs-ppd 2013-05-10 17:02:23.190892928 +0200
+++ hplip-3.13.4/prnt/ps/hp-laserjet_2200_series-ps.ppd 2013-05-10 17:01:02.231023762 +0200
@@ -54,6 +54,7 @@
*Product: "(HP LaserJet 2200)"
*Product: "(Hewlett-Packard HP LaserJet 2200)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;"
*PSVersion: "(2014.116) 0"
*%================================================= *%=================================================
diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_2300-ps.ppd diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_2300-ps.ppd
--- hplip-3.13.4/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 --- hplip-3.13.4/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200

7
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.13.4 Version: 3.13.4
Release: 1%{?dist} Release: 3%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Group: System Environment/Daemons Group: System Environment/Daemons
@ -526,7 +526,10 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Thu Apr 11 2013 Tim Waugh <twaugh@redhat.com> * Fri May 10 2013 Jiri Popelka <jpopelka@redhat.com> - 3.13.4-3
- Device ID for HP LaserJet 2200 (bug #873123#c8).
* Thu Apr 11 2013 Tim Waugh <twaugh@redhat.com> - 3.13.4-2
- Fixed changelog dates. - Fixed changelog dates.
- Device ID for HP LaserJet P1005 (bug #950776). - Device ID for HP LaserJet P1005 (bug #950776).
- mark cron job file as config(noreplace) - mark cron job file as config(noreplace)