- Updated to foomatic-db-4.0-20090819.

- Removed deprecated foomatic-db-hpijs tarball.
- Use buildroot macro throughout.
This commit is contained in:
Tim Waugh 2009-08-19 11:49:13 +00:00
parent 62ce686419
commit 84c49a6550
4 changed files with 16 additions and 60 deletions

View File

@ -1,2 +1,3 @@
foomatic-db-4.0-20090702.tar.gz
foomatic-db-hpijs-20090701.tar.gz
foomatic-db-4.0-20090819.tar.gz

View File

@ -1,25 +0,0 @@
diff -up foomatic-db-20090702/db/source/driver/stcolor.xml.epson-stylus-color-200 foomatic-db-20090702/db/source/driver/stcolor.xml
--- foomatic-db-20090702/db/source/driver/stcolor.xml.epson-stylus-color-200 2009-07-02 08:49:20.000000000 +0100
+++ foomatic-db-20090702/db/source/driver/stcolor.xml 2009-08-04 16:08:19.378201381 +0100
@@ -22,6 +22,9 @@ better dithering. Try it.</en>
<id>printer/Epson-Stylus_Color</id><!-- Epson Stylus Color -->
</printer>
<printer>
+ <id>printer/Epson-Stylus_Color_200</id><!-- Epson Stylus Color 200 -->
+ </printer>
+ <printer>
<id>printer/Epson-Stylus_Color_300</id><!-- Epson Stylus Color 300 -->
<comments>
<en>Works with the "-dMicroweave" option.</en>
diff -up foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml.epson-stylus-color-200 foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml
--- foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml.epson-stylus-color-200 2009-07-02 08:49:23.000000000 +0100
+++ foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml 2009-08-04 16:08:19.382201394 +0100
@@ -19,7 +19,7 @@
<autodetect></autodetect>
<functionality>B</functionality>
<!--not "unverified"-->
- <driver>mj500c</driver>
+ <driver>stcolor</driver>
<comments>
<en>Imported from old Red Hat japanese printer database</en>
</comments>

View File

@ -1,20 +1,16 @@
%define dbver_rel 4.0
%define dbver_snap 20090702
%define hpijsver 20090701
%define dbver_snap 20090819
Summary: Database of printers and printer drivers
Name: foomatic-db
Version: %{dbver_rel}
Release: 4.%{dbver_snap}%{?dist}
Release: 5.%{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/foomatic-db-hpijs-%{hpijsver}.tar.gz
Patch1: foomatic-db-epson-stylus-color-200.patch
Url: http://www.openprinting.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -54,14 +50,10 @@ Requires: %{name}-filesystem = %{version}-%{release}
PPDs from printer manufacturers.
%prep
%setup -q -c -a 1
%setup -q -n %{name}-%{dbver_snap}
find -type d | xargs chmod g-s
pushd foomatic-db-%{dbver_snap}
%patch1 -p1 -b .epson-stylus-color-200
cd db/source
# For gutenprint printers, use gutenprint-ijs-simplified.5.2.
@ -86,42 +78,27 @@ done
# Use sed instead of perl in the PPDs (bug #512739).
find PPD -type f -name '*.ppd' | xargs perl -pi -e 's,perl -p,sed,'
popd
%build
pushd foomatic-db-%{dbver_snap}
%configure
make PREFIX=%{_prefix}
popd
pushd foomatic-db-hpijs-%{hpijsver}
%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
find %{buildroot}%{_datadir}/foomatic/db/source/ -type f | xargs chmod 0644
mkdir $RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/PPD/Custom
mkdir %{buildroot}%{_datadir}/foomatic/db/source/PPD/Custom
rm -f $RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/PPD/Kyocera/*.txt \
$RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/PPD/Kyocera/*.htm \
$RPM_BUILD_ROOT%{_datadir}/cups/model/3-distribution
rm -f %{buildroot}%{_datadir}/foomatic/db/source/PPD/Kyocera/*.htm \
%{buildroot}%{_datadir}/cups/model/3-distribution
# Convert absolute symlink to relative.
rm -f %{buildroot}%{_datadir}/cups/model/foomatic-db-ppds
@ -138,10 +115,9 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc foomatic-db-%{dbver_snap}/db/source/PPD/Kyocera/*.txt
%doc foomatic-db-%{dbver_snap}/db/source/PPD/Kyocera/*.htm
%doc foomatic-db-%{dbver_snap}/README
%doc foomatic-db-%{dbver_snap}/COPYING
%doc db/source/PPD/Kyocera/*.htm
%doc README
%doc COPYING
%{_datadir}/foomatic/db/oldprinterids
%{_datadir}/foomatic/db/source/printer
%{_datadir}/foomatic/db/source/driver
@ -153,6 +129,11 @@ rm -rf %{buildroot}
%{_datadir}/cups/model/foomatic-db-ppds
%changelog
* Wed Aug 19 2009 Tim Waugh <twaugh@redhat.com> 4.0-5.20090819
- Updated to foomatic-db-4.0-20090819.
- Removed deprecated foomatic-db-hpijs tarball.
- Use buildroot macro throughout.
* Tue Aug 18 2009 Tim Waugh <twaugh@redhat.com> 4.0-4.20090702
- Use stcolor driver for Epson Stylus Color 200 (bug #513676).

View File

@ -1,2 +1 @@
df252272fd8f802c57650bbc059a0f42 foomatic-db-4.0-20090702.tar.gz
2bc452f3bf81c83f8d008c95167f7f8b foomatic-db-hpijs-20090701.tar.gz
b48520c72a3690b35bb93585fd2e632a foomatic-db-4.0-20090819.tar.gz