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

- Add Device ID for HP LaserJet 2300 (#576928)

Browse Source
This commit is contained in:
Jiří Popelka 2010-03-26 15:36:56 +00:00
parent 3299c82e1c
commit a2b33b0117
3 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hplip-device-ids.patch
View File

@ -622,6 +622,15 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp
PCFileName "hp-laserjet_2200-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 2200 Printer)"
Attribute "Product" "" "(HP LaserJet 2200d Printer)"
@@ -9241,7 +9241,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 2300"
Attribute "NickName" "" "HP LaserJet 2300 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 2300"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2300;DES:hp laserjet 2300;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series;"
PCFileName "hp-laserjet_2300-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 2300 Printer)"
Attribute "Product" "" "(HP LaserJet 2300n Printer)"
@@ -7275,7 +7275,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 2300 Series"
Attribute "NickName" "" "HP LaserJet 2300 Series, $Version"

22
hplip-laserjet_2300-deviceID.patch Normal file
View File

@ -0,0 +1,22 @@
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.laserjet_2300-deviceID hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.laserjet_2300-deviceID 2010-03-26 16:14:32.000000000 +0100
+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd 2010-03-26 16:16:30.000000000 +0100
@@ -61,6 +61,7 @@
*Product: "(Hewlett-Packard hp LaserJet 2300L)"
*Product: "(HP LaserJet 2300L)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series"
*PSVersion: "(3010.107) 0"
*%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.laserjet_2300-deviceID hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.laserjet_2300-deviceID 2010-03-26 16:14:35.000000000 +0100
+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd 2010-03-26 16:16:38.000000000 +0100
@@ -61,6 +61,7 @@
*Product: "(Hewlett-Packard hp LaserJet 2300L)"
*Product: "(HP LaserJet 2300L)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series"
*PSVersion: "(3010.107) 0"
*%=================================================

14
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.10.2
Release: 5%{?dist}
Release: 6%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@ -26,6 +26,8 @@ Patch10: hplip-discovery-method.patch
Patch11: hplip-device-reconnected.patch
Patch14: hplip-hpcups-sigpipe.patch
Patch16: hplip-bad-low-ink-warning.patch
Patch17: hplip-laserjet_2300-deviceID.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(pre): /sbin/service
@ -158,6 +160,13 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
%patch16 -p1 -b .bad-low-ink-warning
# Add Device ID for HP LaserJet 2300 (#576928)
gunzip prnt/ps/hp-laserjet_2300-ps.ppd.gz
gunzip prnt/ps/hp-laserjet_2300_series-ps.ppd.gz
%patch17 -p1 -b .laserjet_2300-deviceID
gzip -n prnt/ps/hp-laserjet_2300-ps.ppd
gzip -n prnt/ps/hp-laserjet_2300_series-ps.ppd
sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in
@ -372,6 +381,9 @@ fi
/usr/bin/update-desktop-database &>/dev/null ||:
%changelog
* Fri Mar 26 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.2-6
- Add Device ID for HP LaserJet 2300 (#576928)
* Tue Mar 23 2010 Tim Waugh <twaugh@redhat.com> - 3.10.2-5
- Explicitly destroy tray icon on exit (bug #543286).