rpms/cups
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Load MIME type rules correctly (bug #426089, STR #3059).

Browse Source
This commit is contained in:
Tim Waugh 2009-01-28 17:42:16 +00:00
parent 3244c62a59
commit b017e2a1bc
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cups-str3059.patch Normal file
View File

@ -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

5
cups.spec
View File

@ -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).