rpms/foomatic/devel foomatic-busyloop.patch, NONE, 1.1 foomatic.spec, 1.195, 1.196
Tim Waugh
twaugh at fedoraproject.org
Tue Sep 2 13:37:36 UTC 2008
Author: twaugh
Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1750
Modified Files:
foomatic.spec
Added Files:
foomatic-busyloop.patch
Log Message:
* Tue Sep 2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-63
- Avoid busy-looping when trying to shorten long PPD nicknames.
foomatic-busyloop.patch:
--- NEW FILE foomatic-busyloop.patch ---
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 ...
Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- foomatic.spec 2 Sep 2008 12:18:15 -0000 1.195
+++ foomatic.spec 2 Sep 2008 13:37:05 -0000 1.196
@@ -42,6 +42,7 @@
Patch18: foomatic-sigpipe.patch
Patch19: foomatic-459847.patch
+Patch20: foomatic-busyloop.patch
Url: http://www.linuxprinting.org
BuildRequires: perl >= 3:5.8.1
@@ -97,6 +98,7 @@
%patch14 -p1 -b .ampathxml
%patch10 -p1 -b .xml-cflags
%patch15 -p1
+%patch20 -p1 -b .busyloop
./make_configure
popd
@@ -248,6 +250,9 @@
%{_var}/cache/foomatic
%changelog
+* Tue Sep 2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-63
+- Avoid busy-looping when trying to shorten long PPD nicknames.
+
* Tue Sep 2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-62
- Removed patch fuzz.
- Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).
More information about the fedora-extras-commits
mailing list