rpms/foomatic/F-8 foomatic-busyloop.patch, NONE, 1.1 foomatic.spec, 1.175, 1.176

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27775

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-busyloop.patch 
Log Message:
* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61
- Avoid busy-looping when trying to shorten long PPD nicknames.


foomatic-busyloop.patch:

--- NEW FILE foomatic-busyloop.patch ---
diff -U0 foomatic-db-engine-3.0-20080211/ChangeLog.busyloop foomatic-db-engine-3.0-20080211/ChangeLog
diff -up foomatic-db-engine-3.0-20080211/lib/Foomatic/DB.pm.busyloop foomatic-db-engine-3.0-20080211/lib/Foomatic/DB.pm
--- foomatic-db-engine-3.0-20080211/lib/Foomatic/DB.pm.busyloop	2008-02-11 21:14:29.000000000 +0000
+++ foomatic-db-engine-3.0-20080211/lib/Foomatic/DB.pm	2008-09-02 13:19:24.000000000 +0100
@@ -4180,8 +4180,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/F-8/foomatic.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- foomatic.spec	2 Sep 2008 10:33:04 -0000	1.175
+++ foomatic.spec	2 Sep 2008 12:22:30 -0000	1.176
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    60%{?dist}
+Release:    61%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -47,6 +47,7 @@
 Patch18: foomatic-sigpipe.patch
 
 Patch19: foomatic-459847.patch
+Patch20: foomatic-busyloop.patch
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
@@ -103,6 +104,7 @@
 %patch14 -p1 -b .ampathxml
 %patch10 -p1 -b .xml-cflags
 %patch15 -p1
+%patch20 -p1 -b .busyloop
 ./make_configure
 popd
 
@@ -253,6 +255,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61
+- Avoid busy-looping when trying to shorten long PPD nicknames.
+
 * Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-60
 - Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).