diff --git a/hplip-device-ids.patch b/hplip-device-ids.patch index 9f52a6d..bfe09f7 100644 --- a/hplip-device-ids.patch +++ b/hplip-device-ids.patch @@ -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" diff --git a/hplip-laserjet_2300-deviceID.patch b/hplip-laserjet_2300-deviceID.patch new file mode 100644 index 0000000..5b46325 --- /dev/null +++ b/hplip-laserjet_2300-deviceID.patch @@ -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" + + *%================================================= diff --git a/hplip.spec b/hplip.spec index f78a231..be46092 100644 --- a/hplip.spec +++ b/hplip.spec @@ -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 - 3.10.2-6 +- Add Device ID for HP LaserJet 2300 (#576928) + * Tue Mar 23 2010 Tim Waugh - 3.10.2-5 - Explicitly destroy tray icon on exit (bug #543286).