From b017e2a1bc549ec817a413e01c41aaa441e70318 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Jan 28 2009 17:42:16 +0000
Subject: - Load MIME type rules correctly (bug #426089, STR #3059).


---

diff --git a/cups-str3059.patch b/cups-str3059.patch
new file mode 100644
index 0000000..6064594
--- /dev/null
+++ b/cups-str3059.patch
@@ -0,0 +1,14 @@
+diff -up cups-1.4b2/CHANGES-1.3.txt.str3059 cups-1.4b2/CHANGES-1.3.txt
+diff -up cups-1.4b2/scheduler/type.c.str3059 cups-1.4b2/scheduler/type.c
+--- cups-1.4b2/scheduler/type.c.str3059	2008-07-11 23:46:21.000000000 +0100
++++ cups-1.4b2/scheduler/type.c	2009-01-28 17:40:23.000000000 +0000
+@@ -188,8 +188,7 @@ mimeAddTypeRule(mime_type_t *mt,	/* I - 
+     else if (*rule == '+' && current != NULL)
+     {
+       if (logic != MIME_MAGIC_AND &&
+-          current != NULL && current->prev != NULL &&
+-	  current->prev->prev != NULL)
++          current != NULL && current->prev != NULL)
+       {
+        /*
+         * OK, we have more than 1 rule in the current tree level...  Make a
diff --git a/cups.spec b/cups.spec
index bd5ca74..87c7a2c 100644
--- a/cups.spec
+++ b/cups.spec
@@ -48,6 +48,7 @@ Patch21: cups-usb-paperout.patch
 Patch22: cups-build.patch
 Patch23: cups-str3077.patch
 Patch24: cups-str3078.patch
+Patch25: cups-str3059.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -192,6 +193,7 @@ module.
 %patch22 -p1 -b .build
 %patch23 -p1 -b .str3077
 %patch24 -p1 -b .str3078
+%patch25 -p1 -b .str3059
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -458,6 +460,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Wed Jan 28 2009 Tim Waugh <twaugh@redhat.com>
+- Load MIME type rules correctly (bug #426089, STR #3059).
+
 * Wed Jan 28 2009 Tim Waugh <twaugh@redhat.com> 1:1.4-0.b2.4
 - Fixed quotas (STR #3077, STR #3078).