rpms
/
foomatic-db
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated to foomatic-db-4.0-20110221.

This commit is contained in:
Tim Waugh 2011-02-21 19:56:41 +00:00
parent 9c1f3bb322
commit 3500df963e
7 changed files with 12 additions and 478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ foomatic-db-4.0-20100204.tar.gz
/foomatic-db-4.0-20100819.tar.gz
/foomatic-db-hpijs-20090901.tar.gz
/foomatic-db-4.0-20101123.tar.gz
/foomatic-db-4.0-20110221.tar.gz

140
foomatic-db-device-ids-20100416.patch
View File

@ -1,140 +0,0 @@
diff -up foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_3800.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_3800.xml
--- foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_3800.xml.device-ids-20100416 2010-04-16 19:07:15.569148536 +0100
+++ foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_3800.xml 2010-04-16 19:08:42.589148242 +0100
@@ -20,6 +20,13 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,POSTSCRIPT</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>HP Color LaserJet 3800</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<drivers>
diff -up foomatic-db-20100204/db/source/printer/HP-DeskJet_1280.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-DeskJet_1280.xml
--- foomatic-db-20100204/db/source/printer/HP-DeskJet_1280.xml.device-ids-20100416 2010-04-16 19:07:15.587147834 +0100
+++ foomatic-db-20100204/db/source/printer/HP-DeskJet_1280.xml 2010-04-16 19:08:42.589148242 +0100
@@ -18,6 +18,13 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>MLC,PCL,PML,DESKJET,DW-PCL,DYN</commandset>
+ <manufacturer>HP</manufacturer>
+ <model>Deskjet 1280</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<comments>
diff -up foomatic-db-20100204/db/source/printer/HP-DeskJet_D2300.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-DeskJet_D2300.xml
--- foomatic-db-20100204/db/source/printer/HP-DeskJet_D2300.xml.device-ids-20100416 2010-04-16 19:07:15.626272889 +0100
+++ foomatic-db-20100204/db/source/printer/HP-DeskJet_D2300.xml 2010-04-16 19:08:42.590147748 +0100
@@ -17,10 +17,9 @@
</lang>
<autodetect>
<usb>
- <commandset>LDL,DYN</commandset>
- <description>Deskjet D2300</description>
- <manufacturer>hp</manufacturer>
- <model>Deskjet D2300</model>
+ <commandset>LDL</commandset>
+ <manufacturer>HP</manufacturer>
+ <model>Deskjet D2300 series</model>
</usb>
</autodetect>
<functionality>B</functionality>
diff -up foomatic-db-20100204/db/source/printer/HP-DeskJet_F2100.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-DeskJet_F2100.xml
--- foomatic-db-20100204/db/source/printer/HP-DeskJet_F2100.xml.device-ids-20100416 2010-04-16 19:07:15.627273338 +0100
+++ foomatic-db-20100204/db/source/printer/HP-DeskJet_F2100.xml 2010-04-16 19:08:42.591148730 +0100
@@ -17,10 +17,9 @@
</lang>
<autodetect>
<general>
- <commandset>LDL,DYN</commandset>
- <description>Deskjet F2100</description>
- <manufacturer>hp</manufacturer>
- <model>Deskjet F2100</model>
+ <commandset>LDL,MLC,PML,DYN</commandset>
+ <manufacturer>HP</manufacturer>
+ <model>Deskjet F2100 series</model>
</general>
</autodetect>
<functionality>B</functionality>
diff -up foomatic-db-20100204/db/source/printer/HP-OfficeJet_7300.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-OfficeJet_7300.xml
--- foomatic-db-20100204/db/source/printer/HP-OfficeJet_7300.xml.device-ids-20100416 2010-04-16 19:07:15.675273282 +0100
+++ foomatic-db-20100204/db/source/printer/HP-OfficeJet_7300.xml 2010-04-16 19:08:42.593147690 +0100
@@ -19,11 +19,6 @@
</text>
</lang>
<autodetect>
- <general>
- <commandset>MLC,PCL,PML,DW-PCL,BIDI-ECP</commandset>
- <manufacturer>Hewlett-Packard</manufacturer>
- <model>officejet 7300 series</model>
- </general>
<usb>
<commandset>MLC,PCL,PML,DW-PCL,DESKJET,DYN</commandset>
<description>6543</description>
diff -up foomatic-db-20100204/db/source/printer/HP-PhotoSmart_7400.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-PhotoSmart_7400.xml
--- foomatic-db-20100204/db/source/printer/HP-PhotoSmart_7400.xml.device-ids-20100416 2010-04-16 19:07:15.699273421 +0100
+++ foomatic-db-20100204/db/source/printer/HP-PhotoSmart_7400.xml 2010-04-16 19:08:42.595147492 +0100
@@ -20,10 +20,10 @@
</lang>
<autodetect>
<general>
- <commandset>MLC,PCL,PML,DW-PCL,DYN,DESKJET</commandset>
- <description>hp photosmart 7400</description>
- <manufacturer>hp</manufacturer>
- <model>photosmart 7400</model>
+ <commandset>MLC,PCL,PML,DW-PCL,DESKJET,DYN</commandset>
+ <description>7450</description>
+ <manufacturer>HP</manufacturer>
+ <model>Photosmart 7400 series</model>
</general>
</autodetect>
<functionality>A</functionality>
diff -up foomatic-db-20100204/db/source/printer/HP-PSC_2400.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-PSC_2400.xml
--- foomatic-db-20100204/db/source/printer/HP-PSC_2400.xml.device-ids-20100416 2010-04-16 19:07:15.690273117 +0100
+++ foomatic-db-20100204/db/source/printer/HP-PSC_2400.xml 2010-04-16 19:08:42.594147569 +0100
@@ -19,12 +19,11 @@
</text>
</lang>
<autodetect>
- <general>
- <ieee1284>MFG:Hewlett-Packard;MDL:PSC 2400 Series;CMD:MLC,PCL,PML,DW-PCL,DYN;CLS:PRINTER;</ieee1284>
- <commandset>MLC,PCL,PML,DW-PCL,DYN</commandset>
- <manufacturer>Hewlett-Packard</manufacturer>
- <model>PSC 2400 Series</model>
- </general>
+ <usb>
+ <commandset>MLC,PCL,PML,DW-PCL</commandset>
+ <manufacturer>hp</manufacturer>
+ <model>psc 2400 series</model>
+ </usb>
</autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
diff -up foomatic-db-20100204/db/source/printer/Lexmark-E120.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/Lexmark-E120.xml
--- foomatic-db-20100204/db/source/printer/Lexmark-E120.xml.device-ids-20100416 2010-04-16 19:07:15.847272691 +0100
+++ foomatic-db-20100204/db/source/printer/Lexmark-E120.xml 2010-04-16 19:08:42.596147414 +0100
@@ -12,6 +12,14 @@
<lang>
<pcl level="5e" />
</lang>
+ <autodetect>
+ <usb>
+ <commandset>NPAP, PJL</commandset>
+ <description>Lexmark E120</description>
+ <manufacturer>Lexmark International</manufacturer>
+ <model>Lexmark E120</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hpijs-pcl5e</driver>
<drivers>

18
foomatic-db-device-ids-20100506.patch
View File

@ -1,18 +0,0 @@
diff -up foomatic-db-20100819/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd.device-ids-20100506 foomatic-db-20100819/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd
--- foomatic-db-20100819/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd.device-ids-20100506 2010-08-19 09:41:02.000000000 +0200
+++ foomatic-db-20100819/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd 2010-08-20 19:03:39.000000000 +0200
@@ -42,6 +42,7 @@
*PSVersion: "(3017.104) 2"
*ShortNickName: "Ricoh Aficio SP C420DN PS"
*NickName: "Ricoh Aficio SP C420DN PS"
+*1284DeviceID: "MFG:RICOH;MDL:Aficio SP C420DN;CMD:PJL,RCS,PCL,PCLXL,POSTSCRIPT,POSTSCRIPT,PCL,PCLXL;"
*%PNP_NAME: "Aficio SP C420DN"
*%LOADDLL_NAME32: "MFRICRES.dll"
@@ -1629,4 +1630,4 @@ cleartomark\n"
*CloseGroup: JobLog/Job Log
-*% end of Printer Description file
\ No newline at end of file
+*% end of Printer Description file

17
foomatic-db-device-ids-20101123.patch
View File

@ -1,17 +0,0 @@
diff -up foomatic-db-20101123/db/source/printer/Canon-imageRunner_3225.xml.device-ids-20101123 foomatic-db-20101123/db/source/printer/Canon-imageRunner_3225.xml
--- foomatic-db-20101123/db/source/printer/Canon-imageRunner_3225.xml.device-ids-20101123 2010-11-23 16:27:55.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/Canon-imageRunner_3225.xml 2010-11-23 17:57:10.000000000 +0100
@@ -5,6 +5,13 @@
<postscript level="3" />
<pcl level="6" />
</lang>
+ <autodetect>
+ <usb>
+ <commandset>LIPSLX,PS,PostScript,PCL,PJL,CPCA,1284.4-2000</commandset>
+ <manufacturer>Canon</manufacturer>
+ <model>iR3225 (UFR II)</model>
+ </usb>
+ </autodetect>
<functionality>B</functionality>
<driver>pxlmono</driver>
<drivers>

244
foomatic-db-device-ids-20101202.patch
View File

@ -1,244 +0,0 @@
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_2500.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_2500.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_2500.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_2500.xml 2010-12-02 16:00:22.000000000 +0100
@@ -20,6 +20,13 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,MLC,BIDI-ECP,POSTSCRIPT,PJL,PCLXL,PCL</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>hp color LaserJet 2500</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_3700.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_3700.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_3700.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_3700.xml 2010-12-02 16:00:22.000000000 +0100
@@ -20,6 +20,13 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,MLC,BIDI-ECP,PCLXL,PCL,PJL,PDF,POSTSCRIPT</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>hp color LaserJet 3700</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4550.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4550.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4550.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4550.xml 2010-12-02 16:08:58.000000000 +0100
@@ -22,7 +22,7 @@
</lang>
<autodetect>
<parallel>
- <commandset>PJL,MLC,PCL,POSTSCRIPT,PCLXL,P</commandset>
+ <commandset>PJL,MLC,PCL,POSTSCRIPT,PCLXL,PJL</commandset>
<description>Hewlett-Packard Color LaserJet 4550</description>
<manufacturer>Hewlett-Packard</manufacturer>
<model>HP Color LaserJet 4550</model>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4650.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4650.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4650.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4650.xml 2010-12-02 16:00:22.000000000 +0100
@@ -20,6 +20,13 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,MIME,POSTSCRIPT</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>hp color LaserJet 4650</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4700.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4700.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4700.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4700.xml 2010-12-02 16:00:22.000000000 +0100
@@ -20,6 +20,13 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,POSTSCRIPT</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>HP Color LaserJet 4700</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_5550.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_5550.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_5550.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_5550.xml 2010-12-02 16:11:41.000000000 +0100
@@ -20,6 +20,13 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,MIME,POSTSCRIPT</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>hp color LaserJet 5550</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_CM4730_MFP.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_CM4730_MFP.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_CM4730_MFP.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_CM4730_MFP.xml 2010-12-02 16:00:22.000000000 +0100
@@ -20,6 +20,13 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,MLC,BIDI-ECP,PJL,PCLXL,PCL,PDF,POSTSCRIPT</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>HP Color LaserJet CM4730 MFP</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-DeskJet_D4100.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-DeskJet_D4100.xml
--- foomatic-db-20101123/db/source/printer/HP-DeskJet_D4100.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-DeskJet_D4100.xml 2010-12-02 16:00:22.000000000 +0100
@@ -19,8 +19,8 @@
<usb>
<commandset>LDL,DYN</commandset>
<description>Deskjet D4100</description>
- <manufacturer>hp</manufacturer>
- <model>Deskjet D4100</model>
+ <manufacturer>HP</manufacturer>
+ <model>Deskjet D4100 series</model>
</usb>
</autodetect>
<functionality>B</functionality>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_4050.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_4050.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_4050.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_4050.xml 2010-12-02 16:05:27.000000000 +0100
@@ -20,15 +20,16 @@
</text>
</lang>
<autodetect>
- <parallel>
+ <general>
<commandset>PJL,MLC,PCL,PCLXL,POSTSCRIPT</commandset>
- <description>Hewlett-Packard LaserJet 4050 Series</description>
<manufacturer>Hewlett-Packard</manufacturer>
<model>HP LaserJet 4050 Series</model>
+ </general>
+ <parallel>
+ <description>Hewlett-Packard LaserJet 4050 Series</description>
</parallel>
<usb>
<description>Hewlett-Packard LaserJet 4050 Series INTERFACE=7/1/1</description>
- <model>HP LaserJet 4050 Series</model>
</usb>
<snmp>
<description>HP LaserJet 4050 Series</description>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_4100.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_4100.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_4100.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_4100.xml 2010-12-02 16:06:15.000000000 +0100
@@ -21,7 +21,7 @@
</lang>
<autodetect>
<parallel>
- <commandset>PJL,MLC,PCL,POSTSCRIPT,PCLXL,P</commandset>
+ <commandset>PJL,MLC,POSTSCRIPT,PCLXL,PJL,PCL</commandset>
<description>Hewlett-Packard LaserJet 4100 Series</description>
<manufacturer>Hewlett-Packard</manufacturer>
<model>HP LaserJet 4100 Series</model>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_4350.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_4350.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_4350.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_4350.xml 2010-12-02 16:00:22.000000000 +0100
@@ -19,19 +19,11 @@
</text>
</lang>
<autodetect>
- <general>
- <ieee1284>MFG:HP;MDL:hp LaserJet 4350L;</ieee1284>
- <manufacturer>HP</manufacturer>
- <model>hp LaserJet 4350L</model>
- </general>
- <parallel>
- <commandset>PJL,MLC,POSTSCRIPT,PJL,PCLXL,P</commandset>
+ <usb>
+ <commandset>PJL,MLC,PCLXL,PCL,PJL,POSTSCRIPT,PDF</commandset>
<manufacturer>Hewlett-Packard</manufacturer>
- <model>hp LaserJet 4300</model>
- </parallel>
- <snmp>
- <description>hp LaserJet 4300</description>
- </snmp>
+ <model>hp LaserJet 4350</model>
+ </usb>
</autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_5100.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_5100.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_5100.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_5100.xml 2010-12-02 16:00:22.000000000 +0100
@@ -19,6 +19,13 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,MLC,PCL,PCLXL,POSTSCRIPT</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>HP LaserJet 5100 Series</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_8000.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_8000.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_8000.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_8000.xml 2010-12-02 16:00:22.000000000 +0100
@@ -18,6 +18,13 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,MLC,PCL,PCLXL,POSTSCRIPT</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>HP LaserJet 8000 Series</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_P3005.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_P3005.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_P3005.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_P3005.xml 2010-12-02 16:00:22.000000000 +0100
@@ -20,12 +20,12 @@
</text>
</lang>
<autodetect>
- <general>
- <commandset>PJL,MLC,BIDI-ECP,PCL,POSTSCRIP</commandset>
+ <usb>
+ <commandset>PJL,MLC,BIDI-ECP,POSTSCRIPT,PJL,PCLXL,PCL</commandset>
<description>Hewlett-Packard LaserJet P3005 Series</description>
<manufacturer>Hewlett-Packard</manufacturer>
- <model>HP LaserJet P3005 Series</model>
- </general>
+ <model>HP LaserJet P3005</model>
+ </usb>
</autodetect>
<functionality>A</functionality>
<driver>hplip</driver>

67
foomatic-db.spec
View File

@ -1,23 +1,16 @@
%define dbver_rel 4.0
%define dbver_snap 20101123
%define hpijsver 20090901
%define dbver_snap 20110221
Summary: Database of printers and printer drivers
Name: foomatic-db
Version: %{dbver_rel}
Release: 27.%{dbver_snap}%{?dist}
Release: 1.%{dbver_snap}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
Requires: %{name}-filesystem = %{version}-%{release}
Requires: %{name}-ppds = %{version}-%{release}
Source0: http://www.openprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
Source1: http://www.openprinting.org/download/foomatic/oldstuff/foomatic-db-hpijs-%{hpijsver}.tar.gz
Patch1: foomatic-db-device-ids-20100416.patch
Patch2: foomatic-db-device-ids-20100506.patch
Patch3: foomatic-db-device-ids-20101123.patch
Patch4: foomatic-db-device-ids-20101202.patch
Url: http://www.openprinting.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -63,12 +56,10 @@ Requires: %{name}-filesystem = %{version}-%{release}
PPDs from printer manufacturers.
%prep
%setup -q -c -a 1
%setup -q -n foomatic-db-%{dbver_snap}
find -type d | xargs chmod g-s
pushd foomatic-db-%{dbver_snap}
pushd db/source
# For gutenprint printers, use gutenprint-ijs-simplified.5.2.
@ -106,61 +97,19 @@ popd
# Don't use "-b" when patching PPD files as the backups will be
# packaged.
# Device IDs for:
# - HP Color LaserJet 3800 (bug #581936).
# - HP DeskJet D2300 (bug #580341).
# - HP DeskJet F2100 (bug #579245).
# - HP OfficeJet 7300 (bug #577897).
# - Lexmark E120 (bug #577881).
# - HP DeskJet 1280 (bug #577870).
# - HP PhotoSmart 7400 (bug #577866).
# - HP PSC 2400 (bug #188419).
%patch1 -p1 -b .device-ids-20100416
# Device IDs for:
# - Ricoh Aficio SP C420DN (bug #589533).
%patch2 -p1
# Device IDs for:
# - Canon iR 3225 (bug #651500).
%patch3 -p1
# Device IDs for:
# HP Deskjet D4100 (bug #658091)
# HP Color LaserJet CM4730 MFP (bug #658838)
# HP LaserJet 4050/4100/4350/5100/8000/P3005 (bug #659041)
# HP Color LaserJet 2500/3700/4550/4650/4700/5550 (bug #659042)
%patch4 -p1 -b .device-ids-20101202
# Use sed instead of perl in the PPDs (bug #512739).
find db/source/PPD -type f -name '*.ppd' | xargs perl -pi -e 's,perl -p,sed,'
popd
%build
pushd foomatic-db-hpijs-%{hpijsver}
%configure
make PREFIX=%{_prefix}
popd
pushd foomatic-db-%{dbver_snap}
%configure
make PREFIX=%{_prefix}
popd
%install
rm -rf $RPM_BUILD_ROOT
pushd foomatic-db-%{dbver_snap}
make DESTDIR=%buildroot PREFIX=%{_prefix} \
install
popd
pushd foomatic-db-hpijs-%{hpijsver}
make DESTDIR=%buildroot PREFIX=%{_prefix} \
install
popd
# Remove ghostscript UPP drivers that are gone in 7.07
rm -f %{buildroot}%{_datadir}/foomatic/db/source/driver/{bjc6000a1,PM760p,PM820p,s400a1,sharp,Stc670pl,Stc670p,Stc680p,Stc760p,Stc777p,Stp720p,Stp870p}.upp.xml
@ -187,8 +136,8 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc foomatic-db-%{dbver_snap}/db/source/PPD/Kyocera/*.htm
%doc foomatic-db-%{dbver_snap}/README
%doc db/source/PPD/Kyocera/*.htm
%doc README
%{_datadir}/foomatic/db/oldprinterids
%{_datadir}/foomatic/db/source/printer
%{_datadir}/foomatic/db/source/driver
@ -196,11 +145,15 @@ rm -rf %{buildroot}
%files ppds
%defattr(-,root,root,-)
%doc foomatic-db-%{dbver_snap}/COPYING
%doc COPYING
%{_datadir}/foomatic/db/source/PPD
%{_datadir}/cups/model/foomatic-db-ppds
%changelog
* Mon Feb 21 2011 Tim Waugh <twaugh@redhat.com> 4.0-1.20110221
- Updated to foomatic-db-4.0-20110221.
- No longer need hpijs data.
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0-27.20101123
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

3
sources
View File

@ -1,2 +1 @@
beb05c3a335e8a1e5aea5a030badc35d foomatic-db-hpijs-20090901.tar.gz
37fc61facd0582bae501ec7d0977420a foomatic-db-4.0-20101123.tar.gz
1b53c1d888453d09e79c3a31a4747800 foomatic-db-4.0-20110221.tar.gz