From 9ad4b36b99002de74bf13ade52c0cbefe0e765ab Mon Sep 17 00:00:00 2001
From: jnovy <jnovy>
Date: Jul 18 2006 14:07:55 +0000
Subject: - add audio and video x-ms mime types (#197840)


---

diff --git a/mailcap.spec b/mailcap.spec
index 8e74d55..5afd6ad 100644
--- a/mailcap.spec
+++ b/mailcap.spec
@@ -1,6 +1,6 @@
 Summary: Associates helper applications with particular file types.
 Name: mailcap
-Version: 2.1.20
+Version: 2.1.21
 Release: 1
 License: public domain
 Group: System Environment/Base
@@ -41,6 +41,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/mailcap.*
 
 %changelog
+* Tue Jul 18 2006 Miroslav Lichvar <mlichvar@redhat.com> 2.1.21
+- add audio and video x-ms mime types (#197840)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.1.20-1.1
+- rebuild
+
 * Mon Feb 13 2006 Miroslav Lichvar <mlichvar@redhat.com> 2.1.20-1
 - add OpenOffice.org 2.0 mime types (#173789)
 
diff --git a/mime.types b/mime.types
index e280240..d6743ab 100644
--- a/mime.types
+++ b/mime.types
@@ -385,6 +385,8 @@ audio/x-pn-realaudio		ram rm
 #audio/x-pn-realaudio-plugin	rpm
 audio/x-realaudio		ra
 audio/x-wav			wav
+audio/x-ms-wma			wma
+audio/x-ms-wax			wax
 chemical/x-pdb			pdb
 chemical/x-xyz			xyz
 image/bmp			bmp
@@ -499,6 +501,11 @@ video/vnd.mpegurl		mxu
 video/vnd.mts
 video/vnd.nokia.interleaved-multimedia
 video/vnd.vivo
+video/x-ms-asf			asf asx
+video/x-ms-wm			wm
+video/x-ms-wmv			wmv
+video/x-ms-wmx			wmx
+video/x-ms-wvx			wvx
 video/x-msvideo			avi
 video/x-sgi-movie		movie
 x-conference/x-cooltalk		ice