From cb921e98655c864693181eeab7d7497dacf31763 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Wed, 3 Aug 2005 02:50:06 +0000 Subject: [PATCH] - Added patch to show correct mimetype for OpenOffice.org files when guessing type for attachments with mimetype "application/octet-stream" (#164957) --- evolution-2.0.2-fix-145552.patch | 26 ++++++++++++++++++++++++++ evolution.spec | 10 +++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 evolution-2.0.2-fix-145552.patch diff --git a/evolution-2.0.2-fix-145552.patch b/evolution-2.0.2-fix-145552.patch new file mode 100644 index 0000000..ad2edf0 --- /dev/null +++ b/evolution-2.0.2-fix-145552.patch @@ -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; diff --git a/evolution.spec b/evolution.spec index 6bfce57..0a7cdd8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ExcludeArch: ppc64 Name: evolution Version: 2.3.6.1 -Release: 3 +Release: 4 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -58,6 +58,9 @@ Patch107: evolution-2.2.2-move-autosave-file.patch # Fix for RH bug 150458: 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 # some cyrus servers #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 %patch108 -p3 -b .fix-150458 cd ../.. +%patch109 -p1 -b .fix-164957 #patch200 -p1 -b .commandlength @@ -349,6 +353,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/*.so %changelog +* Tue Aug 2 2005 David Malcolm - 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 - 2.3.6.1-3 - Improved version of evolution-2.3.5.1-fix-150458.patch (#150458)