rpms/cups/devel cups-str3284.patch,NONE,1.1 cups.spec,1.496,1.497

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22428

Modified Files:
	cups.spec 
Added Files:
	cups-str3284.patch 
Log Message:
* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
- Fixed MIME type rules for image/jpeg and image/x-bitmap
  (bug #516438, STR #3284).


cups-str3284.patch:
 mime.types |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cups-str3284.patch ---
diff -up cups-1.4rc1/conf/mime.types.str3284 cups-1.4rc1/conf/mime.types
--- cups-1.4rc1/conf/mime.types.str3284	2009-05-17 00:48:35.000000000 +0100
+++ cups-1.4rc1/conf/mime.types	2009-08-10 10:32:46.887840076 +0100
@@ -95,7 +95,7 @@ application/vnd.hp-HPGL		hpgl \
 
 image/gif			gif string(0,GIF87a) string(0,GIF89a)
 image/png			png string(0,<89>PNG)
-image/jpeg			jpeg jpg jpe string(0,<FFD8FF>) &&\
+image/jpeg			jpeg jpg jpe string(0,<FFD8FF>) +\
 				(char(3,0xe0) char(3,0xe1) char(3,0xe2) char(3,0xe3)\
 				 char(3,0xe4) char(3,0xe5) char(3,0xe6) char(3,0xe7)\
 				 char(3,0xe8) char(3,0xe9) char(3,0xea) char(3,0xeb)\
@@ -114,7 +114,7 @@ image/x-sun-raster		ras string(0,<59a66a
 
 #image/fpx			fpx
 image/x-alias			pix short(8,8) short(8,24)
-image/x-bitmap			bmp string(0,BM) && !printable(2,14)
+image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
 ########################################################################


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -p -r1.496 -r1.497
--- cups.spec	10 Aug 2009 09:35:18 -0000	1.496
+++ cups.spec	10 Aug 2009 09:38:00 -0000	1.497
@@ -63,6 +63,7 @@ Patch35: cups-cups-get-classes.patch
 Patch36: cups-str3272.patch
 Patch37: cups-avahi.patch
 Patch38: cups-str3277.patch
+Patch39: cups-str3284.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -226,6 +227,7 @@ module. 
 %patch36 -p1 -b .str3272
 %patch37 -p1 -b .avahi
 %patch38 -p1 -b .str3277
+%patch39 -p1 -b .str3284
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -520,7 +522,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
+* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
+- Fixed MIME type rules for image/jpeg and image/x-bitmap
+  (bug #516438, STR #3284).
 - Clear out cache files on upgrade.
 - Require acl.