rpms/cups/F-10 cups-str3059.patch,NONE,1.1 cups.spec,1.452,1.453

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9030

Modified Files:
	cups.spec 
Added Files:
	cups-str3059.patch 
Log Message:
* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
- Load MIME type rules correctly (bug #426089, STR #3059).


cups-str3059.patch:

--- NEW FILE cups-str3059.patch ---
diff -up cups-1.3.9/scheduler/type.c.str3059 cups-1.3.9/scheduler/type.c
--- cups-1.3.9/scheduler/type.c.str3059	2008-07-11 23:48:49.000000000 +0100
+++ cups-1.3.9/scheduler/type.c	2009-01-28 17:42:27.000000000 +0000
@@ -187,8 +187,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


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -r1.452 -r1.453
--- cups.spec	28 Jan 2009 17:18:09 -0000	1.452
+++ cups.spec	28 Jan 2009 17:49:12 -0000	1.453
@@ -55,6 +55,7 @@
 Patch29: cups-str2831.patch
 Patch30: cups-str3077.patch
 Patch31: cups-str3078.patch
+Patch32: cups-str3059.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -196,6 +197,7 @@
 %patch29 -p1 -b .str2831
 %patch30 -p1 -b .str3077
 %patch31 -p1 -b .str3078
+%patch32 -p1 -b .str3059
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -484,6 +486,9 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
+- Load MIME type rules correctly (bug #426089, STR #3059).
+
 * Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.9-7
 - Fixed quotas (STR #3077, STR #3078).