Merge branch 'f13' into f14
This commit is contained in:
commit
a827470389
@ -1,16 +0,0 @@
|
|||||||
diff -up foomatic-db-20100204/db/source/printer/Canon-imageRunner_C3170.xml.C3170 foomatic-db-20100204/db/source/printer/Canon-imageRunner_C3170.xml
|
|
||||||
--- foomatic-db-20100204/db/source/printer/Canon-imageRunner_C3170.xml.C3170 2010-07-23 11:24:00.000000000 +0200
|
|
||||||
+++ foomatic-db-20100204/db/source/printer/Canon-imageRunner_C3170.xml 2010-07-23 11:24:51.000000000 +0200
|
|
||||||
@@ -9,6 +9,12 @@
|
|
||||||
<postscript level="3" />
|
|
||||||
<pcl level="5c" />
|
|
||||||
</lang>
|
|
||||||
+ <autodetect>
|
|
||||||
+ <general>
|
|
||||||
+ <manufacturer>Canon</manufacturer>
|
|
||||||
+ <model>iR 3170C EUR 35.01</model>
|
|
||||||
+ </general>
|
|
||||||
+ </autodetect>
|
|
||||||
<functionality>B</functionality>
|
|
||||||
<driver>Postscript</driver>
|
|
||||||
<drivers>
|
|
@ -5,7 +5,7 @@
|
|||||||
Summary: Database of printers and printer drivers
|
Summary: Database of printers and printer drivers
|
||||||
Name: foomatic-db
|
Name: foomatic-db
|
||||||
Version: %{dbver_rel}
|
Version: %{dbver_rel}
|
||||||
Release: 20.%{dbver_snap}%{?dist}
|
Release: 21.%{dbver_snap}%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Requires: %{name}-filesystem = %{version}-%{release}
|
Requires: %{name}-filesystem = %{version}-%{release}
|
||||||
@ -16,7 +16,6 @@ Source1: http://www.openprinting.org/download/foomatic/oldstuff/foomatic-db-hpij
|
|||||||
|
|
||||||
Patch1: foomatic-db-device-ids-20100416.patch
|
Patch1: foomatic-db-device-ids-20100416.patch
|
||||||
Patch2: foomatic-db-device-ids-20100506.patch
|
Patch2: foomatic-db-device-ids-20100506.patch
|
||||||
Patch3: foomatic-db-device-id-C3170.patch
|
|
||||||
|
|
||||||
Url: http://www.openprinting.org
|
Url: http://www.openprinting.org
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
@ -111,9 +110,6 @@ popd
|
|||||||
# - Ricoh Aficio SP C420DN (bug #589533).
|
# - Ricoh Aficio SP C420DN (bug #589533).
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
|
||||||
# Device ID for Canon iR 3170C (bug #617493).
|
|
||||||
%patch3 -p1 -b .C3170
|
|
||||||
|
|
||||||
# Use sed instead of perl in the PPDs (bug #512739).
|
# 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,'
|
find db/source/PPD -type f -name '*.ppd' | xargs perl -pi -e 's,perl -p,sed,'
|
||||||
|
|
||||||
@ -183,6 +179,9 @@ rm -rf %{buildroot}
|
|||||||
%{_datadir}/cups/model/foomatic-db-ppds
|
%{_datadir}/cups/model/foomatic-db-ppds
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 03 2010 Jiri Popelka <jpopelka@redhat.com> 4.0-21.20100819
|
||||||
|
- Remove wrong Device ID for Canon iR 3170C (bug #617493).
|
||||||
|
|
||||||
* Fri Aug 20 2010 Jiri Popelka <jpopelka@redhat.com> 4.0-20.20100819
|
* Fri Aug 20 2010 Jiri Popelka <jpopelka@redhat.com> 4.0-20.20100819
|
||||||
- Removed printer/Samsung-CLP-300|315.xml (bug #625505).
|
- Removed printer/Samsung-CLP-300|315.xml (bug #625505).
|
||||||
- Removed references to foo2oak-z1.
|
- Removed references to foo2oak-z1.
|
||||||
|
Loading…
Reference in New Issue
Block a user