- Updated db-engine to 3.0-20080904.

This commit is contained in:
Tim Waugh 2008-09-04 09:09:18 +00:00
parent d40cc2dde7
commit bcb43682a1
4 changed files with 6 additions and 19 deletions

View File

@ -58,3 +58,4 @@ foomatic-db-engine-3.0-20080710.tar.gz
foomatic-filters-3.0-20080710.tar.gz
foomatic-db-3.0-20080710.tar.gz
foomatic-db-hpijs-20080710.tar.gz
foomatic-db-engine-3.0-20080904.tar.gz

View File

@ -1,15 +0,0 @@
diff -up foomatic-db-engine-3.0-20080710/lib/Foomatic/DB.pm.busyloop foomatic-db-engine-3.0-20080710/lib/Foomatic/DB.pm
--- foomatic-db-engine-3.0-20080710/lib/Foomatic/DB.pm.busyloop 2008-07-10 08:20:10.000000000 +0100
+++ foomatic-db-engine-3.0-20080710/lib/Foomatic/DB.pm 2008-09-02 14:34:27.000000000 +0100
@@ -4237,8 +4237,10 @@ EOFPGSZ
# ShortNickName too long? Remove last words from model name.
$parts{'model'} =~
s/(?<=[a-zA-Z0-9])[^a-zA-Z0-9]+[a-zA-Z0-9]*$//;
- $shortnickname =
+ my $new =
"$parts{'make'} $parts{'model'}, $parts{'driver'}";
+ last if ($new == $shortnickname);
+ $shortnickname = $new;
}
if (length($shortnickname) > 31) {
# If nothing else helps ...

View File

@ -1,5 +1,5 @@
%define dbver 20080710
%define enginever 3.0-20080710
%define enginever 3.0-20080904
%define filtersver 20080710
%define hpijsver 20080710
@ -38,7 +38,6 @@ Patch15: foomatic-bad-utf8.patch
Patch18: foomatic-sigpipe.patch
Patch19: foomatic-459847.patch
Patch20: foomatic-busyloop.patch
Patch21: foomatic-hpclj9500mfp.patch
Url: http://www.linuxprinting.org
@ -94,7 +93,6 @@ chmod a+x mkinstalldirs
%patch14 -p1 -b .ampathxml
%patch10 -p1 -b .xml-cflags
%patch15 -p1
%patch20 -p1 -b .busyloop
./make_configure
popd
@ -246,6 +244,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
%{_var}/cache/foomatic
%changelog
* Thu Sep 4 2008 Tim Waugh <twaugh@redhat.com>
- Updated db-engine to 3.0-20080904.
* Wed Sep 3 2008 Tim Waugh <twaugh@redhat.com>
- Finally remove ppdload.

View File

@ -1,4 +1,4 @@
cca75a1d1a189a2b816a0c20058e6aef foomatic-db-engine-3.0-20080710.tar.gz
ddd20fc710fba33900df82b0b2b95d35 foomatic-filters-3.0-20080710.tar.gz
f959c63dface3453aa0918df3bf6f6a8 foomatic-db-3.0-20080710.tar.gz
35a3a1ebe3c09b9e9a126e31bceedd72 foomatic-db-hpijs-20080710.tar.gz
d46d1a26a8199c8c5c618ad2cd17a68a foomatic-db-engine-3.0-20080904.tar.gz