rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Added patch to show correct mimetype for OpenOffice.org files when

Browse Source 
guessing type for attachments with mimetype "application/octet-stream"
    (#164957)
This commit is contained in:
dmalcolm 2005-08-03 02:50:06 +00:00
parent 0697e92b84
commit cb921e9865
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
evolution-2.0.2-fix-145552.patch Normal file
View File

@ -0,0 +1,26 @@
--- evolution-2.0.2/mail/em-utils.c.fix-145552 2004-09-24 11:49:29.000000000 -0400
+++ evolution-2.0.2/mail/em-utils.c 2005-08-02 22:42:04.000000000 -0400
@@ -1919,10 +1919,22 @@
* try to do better with the filename check.
*/
+ /* RH bug 145552: code based on _gnome_vfs_get_mime_type_internal:
+ * So many file types come compressed by gzip
+ * that extensions are more reliable than magic
+ * typing. If the file has a suffix, then use
+ * the type from the suffix:
+ */
if (magic_type) {
if (name_type
&& (!strcmp(magic_type, "text/plain")
- || !strcmp(magic_type, "application/octet-stream")))
+ || !strcmp(magic_type, "application/octet-stream")
+ || !strcmp(magic_type, "application/octet-stream")
+ || !strcmp(magic_type, "application/x-ole-storage")
+ || !strcmp(magic_type, "text/xml")
+ || !strcmp(magic_type, "application/x-bzip")
+ || !strcmp(magic_type, "application/x-gzip")
+ || !strcmp(magic_type, "application/zip")))
return name_type;
else
return magic_type;

10
evolution.spec
View File

@ -27,7 +27,7 @@ ExcludeArch: ppc64
Name: evolution Name: evolution
Version: 2.3.6.1 Version: 2.3.6.1
Release: 3 Release: 4
License: GPL License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
URL: http://www.ximian.com/ URL: http://www.ximian.com/
@ -58,6 +58,9 @@ Patch107: evolution-2.2.2-move-autosave-file.patch
# Fix for RH bug 150458: # Fix for RH bug 150458:
Patch108: evolution-2.3.5.1-fix-150458.patch Patch108: evolution-2.3.5.1-fix-150458.patch
# Fix for RH bug 164957 (was for 145552):
Patch109: evolution-2.0.2-fix-145552.patch
# not accepted, but proposed on a few occasions. fixes problems with # not accepted, but proposed on a few occasions. fixes problems with
# some cyrus servers # some cyrus servers
#Patch200: evolution-1.4.5-imap-command-length.patch #Patch200: evolution-1.4.5-imap-command-length.patch
@ -184,6 +187,7 @@ Development files needed for building things which link against evolution.
cd widgets/table cd widgets/table
%patch108 -p3 -b .fix-150458 %patch108 -p3 -b .fix-150458
cd ../.. cd ../..
%patch109 -p1 -b .fix-164957
#patch200 -p1 -b .commandlength #patch200 -p1 -b .commandlength
@ -349,6 +353,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/*.so %{_libdir}/evolution/%{evo_major}/*.so
%changelog %changelog
* Tue Aug 2 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.6.1-4
- Added patch to show correct mimetype for OpenOffice.org files when guessing
type for attachments with mimetype "application/octet-stream" (#164957)
* Mon Aug 1 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.6.1-3 * Mon Aug 1 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.6.1-3
- Improved version of evolution-2.3.5.1-fix-150458.patch (#150458) - Improved version of evolution-2.3.5.1-fix-150458.patch (#150458)