From b060606513878bbfd1cf5a1b9bbac07eb78d2493 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Sep 02 2008 13:32:49 +0000
Subject: - Avoid busy-looping when trying to shorten long PPD nicknames.


---

diff --git a/foomatic-busyloop.patch b/foomatic-busyloop.patch
new file mode 100644
index 0000000..aaa0df3
--- /dev/null
+++ b/foomatic-busyloop.patch
@@ -0,0 +1,16 @@
+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 ...
diff --git a/foomatic.spec b/foomatic.spec
index 21fb727..abe4f0a 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -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 @@ Patch17: foomatic-clean-up-on-cancel.patch
 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 @@ chmod a+x mkinstalldirs
 %patch14 -p1 -b .ampathxml
 %patch10 -p1 -b .xml-cflags
 %patch15 -p1
+%patch20 -p1 -b .busyloop
 ./make_configure
 popd
 
@@ -253,6 +255,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Sep  2 2008 Tim Waugh <twaugh@redhat.com> 3.0.2-61
+- Avoid busy-looping when trying to shorten long PPD nicknames.
+
 * Tue Sep  2 2008 Tim Waugh <twaugh@redhat.com> 3.0.2-60
 - Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).