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

- Updated db-engine to 3.0-20061031.

Browse Source 
- Updated db to 3.0-20061031.
This commit is contained in:
Tim Waugh 2006-11-03 17:39:00 +00:00
parent ab08b50d66
commit 34159b4247
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -29,3 +29,4 @@ foomatic-db-3.0-20060103.tar.gz
foomatic-db-3.0-20060116.tar.gz foomatic-db-3.0-20060116.tar.gz
foomatic-db-engine-3.0-20060117.tar.gz foomatic-db-engine-3.0-20060117.tar.gz
foomatic-db-engine-3.0-20060421.tar.gz foomatic-db-engine-3.0-20060421.tar.gz
foomatic-db-engine-3.0-20061031.tar.gz

27
foomatic.spec
View File

@ -1,5 +1,5 @@
%define dbver 20060116 %define dbver 20061031
%define enginever 3.0-20060421 %define enginever 3.0-20061031
%define filtersver 20051209 %define filtersver 20051209
%define hpijsver 1.5-20051209 %define hpijsver 1.5-20051209
@ -39,12 +39,6 @@ Patch5: foomatic-2.0.2-fontpath.patch
Patch6: foomatic-ppdload.patch Patch6: foomatic-ppdload.patch
Patch7: foomatic-ppdload-ppd.patch Patch7: foomatic-ppdload-ppd.patch
# Make CUPS driver work with drivers containing '-' in their names.
Patch8: foomatic-driver-names.patch
# Don't break gimp-print driver
Patch9: foomatic-printoutmode.patch
# Fix 3.0.2 build. # Fix 3.0.2 build.
Patch10: foomatic-db-engine-xml-cflags.patch Patch10: foomatic-db-engine-xml-cflags.patch
@ -54,9 +48,6 @@ Patch14: foomatic-ampathxml.patch
# Handle non-UTF-8 encodings in imported PPD files. # Handle non-UTF-8 encodings in imported PPD files.
Patch15: foomatic-bad-utf8.patch Patch15: foomatic-bad-utf8.patch
# Fix tag mismatch in db.
Patch16: foomatic-badxml.patch
Url: http://www.linuxprinting.org Url: http://www.linuxprinting.org
BuildRequires: perl >= 3:5.8.1 BuildRequires: perl >= 3:5.8.1
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
@ -107,7 +98,6 @@ pushd foomatic-db-engine-%{enginever}
chmod a+x mkinstalldirs chmod a+x mkinstalldirs
%patch2 -p1 -b .libdir %patch2 -p1 -b .libdir
%patch6 -p1 -b .ppdload %patch6 -p1 -b .ppdload
%patch8 -p1 -b .driver-names
%patch14 -p1 -b .ampathxml %patch14 -p1 -b .ampathxml
%patch10 -p1 -b .xml-cflags %patch10 -p1 -b .xml-cflags
%patch15 -p1 %patch15 -p1
@ -119,7 +109,6 @@ popd
pushd foomatic-db-%{dbver} pushd foomatic-db-%{dbver}
%patch7 -p1 -b .ppdload-ppd %patch7 -p1 -b .ppdload-ppd
%patch16 -p1 -b .badxml
%if %with_omni %if %with_omni
# Omni printers # Omni printers
@ -127,20 +116,20 @@ tar xjf %{SOURCE4}
%endif %endif
# Gimp-print-4.2.0 driver info # Gimp-print-4.2.0 driver info
rm db/source/driver/stp.xml
pushd db/source pushd db/source
tar xjf %{SOURCE5} tar xjf %{SOURCE5}
# Fix up 'gimp-print' references to point to 'gimp-print-ijs'. # Fix up 'gimp-print' references to point to 'gimp-print-ijs'.
perl -pi -e 's,>gimp-print<,>gimp-print-ijs<,' printer/*.xml perl -pi -e 's,>gimp-print<,>gimp-print-ijs<,' printer/*.xml
# Recommend gimp-print-ijs instead of gutenprint, just until it
# gets into Core. Anyway, there isn't a 'gutenprint' foomatic driver;
# instead it's gutenprint-ijs.5.0 or gutenprint-ijs-simplified.5.0
perl -pi -e 's,>gutenprint<,>gimp-print-ijs<,' printer/*.xml
# Remove references to foo2zjs and foo2oak (bug #208851). # Remove references to foo2zjs and foo2oak (bug #208851).
find printer -name '*.xml' |xargs grep -l '<driver>foo2'|xargs rm -f find printer -name '*.xml' |xargs grep -l '<driver>foo2'|xargs rm -f
rm -f driver/foo2zjs.xml driver/foo2oak.xml rm -f driver/foo2zjs.xml driver/foo2oak.xml
popd
rm -f db/source/opt/gimp-print-printoutmode.xml
%patch9 -p1 -b .printoutmode
popd popd
%build %build
@ -284,6 +273,8 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
%changelog %changelog
* Fri Nov 3 2006 Tim Waugh <twaugh@redhat.com> 3.0.2-39 * Fri Nov 3 2006 Tim Waugh <twaugh@redhat.com> 3.0.2-39
- Updated db-engine to 3.0-20061031.
- Updated db to 3.0-20061031.
- Remove references to foo2zjs and foo2oak (bug #208851). - Remove references to foo2zjs and foo2oak (bug #208851).
* Thu Aug 3 2006 Tim Waugh <twaugh@redhat.com> 3.0.2-38 * Thu Aug 3 2006 Tim Waugh <twaugh@redhat.com> 3.0.2-38

2
sources
View File

@ -3,4 +3,4 @@ dcfbfbe16d76d0b6e44cb261fccd138f Omni-printers-0.9.2.tar.bz2
5876178c3aefd36102bc5eef575d3f9c foomatic-filters-3.0-20051209.tar.gz 5876178c3aefd36102bc5eef575d3f9c foomatic-filters-3.0-20051209.tar.gz
8c217af8a570124d9ad7f8a4b1270ebe foomatic-db-hpijs-1.5-20051209.tar.gz 8c217af8a570124d9ad7f8a4b1270ebe foomatic-db-hpijs-1.5-20051209.tar.gz
54ae910edbb0ed3816cebe05a0f0b605 foomatic-db-3.0-20060116.tar.gz 54ae910edbb0ed3816cebe05a0f0b605 foomatic-db-3.0-20060116.tar.gz
54e5a0daf74d9d0e851069f54f5b6995 foomatic-db-engine-3.0-20060421.tar.gz 0e72faf4d098cfc37f16467edf6c2570 foomatic-db-engine-3.0-20061031.tar.gz