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

Merge branch 'f14'

Browse Source
This commit is contained in:
Jiri Popelka 2010-12-03 18:01:15 +01:00
commit 1c036d0fd1
3 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hplip-deviceIDs-drv.patch
View File

@ -1,6 +1,6 @@
diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv/hpcups.drv.in
--- hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-09-26 19:09:24.000000000 +0200
+++ hplip-3.10.9/prnt/drv/hpcups.drv.in 2010-12-03 15:39:34.000000000 +0100
+++ hplip-3.10.9/prnt/drv/hpcups.drv.in 2010-12-03 17:28:05.000000000 +0100
@@ -442,7 +442,7 @@ Manufacturer "HP"
ModelName "HP Officejet v40xi"
Attribute "NickName" "" "HP Officejet v40xi, $Version"
@ -1026,6 +1026,15 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
PCFileName "hp-color_laserjet_cp1518ni-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet cp1518ni Printer)"
}
@@ -11134,7 +11135,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet cp2025dn"
Attribute "NickName" "" "HP Color LaserJet cp2025dn pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet cp2025dn"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025dn;DES:hp color laserjet cp2025dn;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP2025dn;DES:Hewlett-Packard Color LaserJet CP2025dn;"
PCFileName "hp-color_laserjet_cp2025dn-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet cp2025dn Printer)"
}
@@ -11150,7 +11151,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet cp2025n"
Attribute "NickName" "" "HP Color LaserJet cp2025n pcl3, $Version"
@ -1071,6 +1080,15 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
PCFileName "hp-color_laserjet_cp3525-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet cp3525 Printer)"
Attribute "Product" "" "(HP Color LaserJet cp3525n Printer)"
@@ -11252,7 +11253,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet cm3530 MFP"
Attribute "NickName" "" "HP Color LaserJet cm3530 MFP pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet cm3530 MFP"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm3530 mfp;DES:hp color laserjet cm3530 mfp;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM3530 MFP;DES:hp color laserjet cm3530 mfp;"
PCFileName "hp-color_laserjet_cm3530_mfp-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet cm3530 Multifunction Printer)"
Attribute "Product" "" "(HP Color LaserJet cm3530fs Multifunction Printer)"
@@ -11261,7 +11262,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet 3700"
Attribute "NickName" "" "HP Color LaserJet 3700 pcl3, $Version"

11
hplip-deviceIDs-ppd.patch
View File

@ -504,3 +504,14 @@ diff -up hplip-3.10.9/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd hpli
*Product: "(HP LaserJet P3015)"
*Product: "(Hewlett-Packard HP LaserJet P3015)"
*Product: "(HP LaserJet P3011)"
diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd
--- hplip-3.10.9/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd 2010-12-03 17:40:35.000000000 +0100
+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd 2010-12-03 17:41:03.000000000 +0100
@@ -51,6 +51,7 @@
*%== Mac OS X specific end ==
*% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM3530 MFP;"
*Manufacturer: "HP"
*Product: "(HP Color LaserJet CM3530 MFP)"
*Product: "(Hewlett-Packard HP Color LaserJet CM3530 MFP)"

21
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.10.9
Release: 7%{?dist}
Release: 8%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@ -155,9 +155,12 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# HP Color LaserJet CP1518ni (bug #613689).
# HP Color LaserJet 2600n (bug #613712).
# HP LaserJet 4050 Series/4100 Series/2100 Series/4350/5100 Series/8000 Series
# P3005/P3010 Series/P4014/P4515 (bug #659039)
# P3005/P3010 Series/P4014/P4515 (bug #659039).
# HP Color LaserJet 2500/3700/4550/4600/4650/4700/5550/CP1515n/CP2025n
# CP3525/CP4520 Series/CM2320nf/CM4730 MFP (bug #659040)
# CP3525/CP4520 Series/CM2320nf (bug #659040).
# HP Color LaserJet CP2025dn (bug #651509).
# HP Color LaserJet CM4730 MFP (bug #658831).
# HP Color LaserJet CM3530 MFP (bug #659381).
%patch5 -p1 -b .deviceIDs-drv
# Stopped hpcups pointlessly trying to read spool files
@ -205,9 +208,11 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# HP Color LaserJet 3800 (bug #581935).
# HP Color LaserJet 2840 (bug #582215).
# HP LaserJet 4050 Series/4100 Series/2100 Series/2420/4200/4300/4350/5100 Series
# 8000 Series/M3027 MFP/M3035 MFP/P3005/P3010 Series (bug #659039)
# 8000 Series/M3027 MFP/M3035 MFP/P3005/P3010 Series (bug #659039).
# HP Color LaserJet 2500/2550/2605dn/3700/4550/4600
# 4650/4700/5550/CP3525/CM4730 MFP (bug #659040)
# 4650/4700/5550/CP3525 (bug #659040).
# HP Color LaserJet CM4730 MFP (bug #658831).
# HP Color LaserJet CM3530 MFP (bug #659381).
for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4);
do
gunzip ${ppd_file#*/}.gz
@ -489,6 +494,11 @@ fi
%postun libs -p /sbin/ldconfig
%changelog
* Fri Dec 03 2010 Jiri Popelka <jpopelka@redhat.com> 3.10.9-8
- Corrected IEEE 1284 Device IDs:
HP Color LaserJet CP2025dn (bug #651509).
HP Color LaserJet CM3530 MFP (bug #659381).
* Fri Dec 03 2010 Jiri Popelka <jpopelka@redhat.com> 3.10.9-7
- The pycups requirement is now python-cups.
- Corrected IEEE 1284 Device IDs:
@ -496,6 +506,7 @@ fi
M3027 MFP/M3035 MFP/P3005/P3010/P4014/P4515 (bug #659039).
HP Color LaserJet 2500/2550 series/3700/4550/4600/4650/4700/5550
CP1515n/CP3525/CP4520/CM2320nf MFP (bug #659040).
HP Color LaserJet CM4730 MFP (bug #658831).
* Fri Nov 12 2010 Tim Waugh <twaugh@redhat.com> - 3.10.9-6
- Call cupsSetUser in cupsext's addPrinter method before connecting so