diff --git a/foomatic-db-device-ids-20120103.patch b/foomatic-db-device-ids-20120103.patch new file mode 100644 index 0000000..d3bfdb2 --- /dev/null +++ b/foomatic-db-device-ids-20120103.patch @@ -0,0 +1,64 @@ +diff -up foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd.device-ids-20120103 foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd +--- foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd.device-ids-20120103 2012-01-03 01:40:44.000000000 +0100 ++++ foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd 2012-01-04 12:57:06.957143132 +0100 +@@ -32,6 +32,7 @@ + *ShortNickName: "Brother MFC-8840D BR-Script3" + *ModelName: "Brother MFC-8840D BR-Script3" + *NickName: "Brother MFC-8840D BR-Script3" ++*1284DeviceID: "MFG:Brother;MDL:MFC-8840D;CMD:HBP,PJL,PCL,PCLXL;" + + *%==== Basic Device Capabilities ============= + *LanguageLevel: "3" +diff -up foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd.device-ids-20120103 foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd +--- foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd.device-ids-20120103 2012-01-03 01:40:44.000000000 +0100 ++++ foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd 2012-01-04 13:11:01.008716056 +0100 +@@ -62,7 +62,7 @@ + *LXCountPIN: "4" + *LXlowPINchar: "0" + *LXhiPINchar: "9" +-*1284DeviceID: "MFG: Lexmark;MDL: Lexmark C543" ++*1284DeviceID: "MFG:Lexmark International;MDL:Lexmark C543;" + *FreeVM: "252000000" + *VMOption 256Meg: "252000000" + *VMOption 320Meg: "312000000" +diff -up foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml +--- foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml.device-ids-20120103 2012-01-04 12:50:22.000000000 +0100 ++++ foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml 2012-01-04 12:56:36.275526708 +0100 +@@ -15,7 +15,7 @@ + + + +- MFG:Brother;MDL:Brother MFC-8840D; ++ MFG:Brother;MDL:MFC-8840D;CMD:HBP,PJL,PCL,PCLXL; + Brother + Brother MFC-8840D + +diff -up foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml +--- foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml.device-ids-20120103 2012-01-04 12:50:22.000000000 +0100 ++++ foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml 2012-01-04 13:05:37.930755086 +0100 +@@ -13,6 +13,13 @@ + + + ++ ++ ++ PJL,PML,PCLXL,POSTSCRIPT,PCL ++ Hewlett-Packard ++ HP LaserJet MFP M1522nf MFP ++ ++ + D + pxlmono + +diff -up foomatic-db-20120103/db/source/printer/Lexmark-C543.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/Lexmark-C543.xml +--- foomatic-db-20120103/db/source/printer/Lexmark-C543.xml.device-ids-20120103 2012-01-04 12:50:22.000000000 +0100 ++++ foomatic-db-20120103/db/source/printer/Lexmark-C543.xml 2012-01-04 13:09:29.851855674 +0100 +@@ -15,7 +15,7 @@ + + + +- MFG: Lexmark;MDL: Lexmark C543 ++ MFG:Lexmark International;MDL:Lexmark C543; + Lexmark + Lexmark C543 + diff --git a/foomatic-db.spec b/foomatic-db.spec index ac30ddd..5a95fe8 100644 --- a/foomatic-db.spec +++ b/foomatic-db.spec @@ -1,10 +1,10 @@ -%define dbver_rel 4.0 -%define dbver_snap 20110614 +%global dbver_rel 4.0 +%global dbver_snap 20120103 Summary: Database of printers and printer drivers Name: foomatic-db Version: %{dbver_rel} -Release: 29.%{dbver_snap}%{?dist} +Release: 30.%{dbver_snap}%{?dist} License: GPLv2+ Group: System Environment/Libraries Requires: %{name}-filesystem = %{version}-%{release} @@ -12,8 +12,9 @@ Requires: %{name}-ppds = %{version}-%{release} Source0: http://www.openprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz +Patch1: foomatic-db-device-ids-20120103.patch + Url: http://www.openprinting.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # The foomatic oki8w driver works for printers that this old package @@ -94,8 +95,13 @@ rm -vf opt/Brother-Ptouch-*.xml popd # foomatic-db patches -# Don't use "-b" when patching PPD files as the backups will be -# packaged. +# Don't use "-b" when patching PPD files as the backups will be packaged. + +# Device IDs for: +# Brother MFC-8840D (#678065) +# HP LaserJet M1522nf MFP (#745499) +# Lexmark C453 (#770169) +%patch1 -p1 # 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,' @@ -125,31 +131,34 @@ rm -f %{buildroot}%{_datadir}/foomatic/db/source/PPD/Kyocera/*.htm \ rm -f %{buildroot}%{_datadir}/cups/model/foomatic-db-ppds ln -sf ../../foomatic/db/source/PPD %{buildroot}%{_datadir}/cups/model/foomatic-db-ppds -%clean -rm -rf %{buildroot} - %files filesystem -%defattr(-,root,root,-) %dir %{_datadir}/foomatic %dir %{_datadir}/foomatic/db %dir %{_datadir}/foomatic/db/source %files -%defattr(-,root,root,-) %doc db/source/PPD/Kyocera/*.htm %doc README %{_datadir}/foomatic/db/oldprinterids %{_datadir}/foomatic/db/source/printer %{_datadir}/foomatic/db/source/driver %{_datadir}/foomatic/db/source/opt +%{_datadir}/foomatic/xmlschema %files ppds -%defattr(-,root,root,-) %doc COPYING %{_datadir}/foomatic/db/source/PPD %{_datadir}/cups/model/foomatic-db-ppds %changelog +* Wed Jan 04 2012 Jiri Popelka 4.0-29.20120103 +- Updated to foomatic-db-4.0-20120103 +- spec modernized +- Device IDs for: + - Brother MFC-8840D (#678065) + - HP LaserJet M1522nf MFP (#745499) + - Lexmark C453 (#770169) + * Tue Jun 14 2011 Tim Waugh 4.0-29.20110614 - Updated to foomatic-db-4.0-20110614. diff --git a/sources b/sources index fd4e1f0..f7e818e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a53872d5dc78f1c2699e6b412dd193c3 foomatic-db-4.0-20110614.tar.gz +b6981599833d4fbb73448e6e40258bb8 foomatic-db-4.0-20120103.tar.gz