Merge latest shared mime info(ver 1.1) related audio/aac

diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index 104451b..e423b74 100644 (file)
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -2968,6 +2968,16 @@ command to generate the output files.
     </magic>
     <glob pattern="*.mo3"/>
   </mime-type>
+  <mime-type type="audio/aac">
+    <_comment>AAC audio</_comment>
+    <acronym>AAC</acronym>
+    <expanded-acronym>Advanced Audio Coding</expanded-acronym>
+    <magic priority="50">
+      <match type="string" value="ADIF" offset="0"/>
+      <match type="big16" value="0xFFF0" mask="0xFFF6" offset="0"/>
+    </magic>
+    <glob pattern="*.aac"/>
+  </mime-type>
   <mime-type type="audio/mp4">
     <_comment>MPEG-4 audio</_comment>
     <alias type="audio/x-m4a"/>
@@ -2975,7 +2985,7 @@ command to generate the output files.
       <match type="string" value="ftypM4A" offset="4"/>
     </magic>
     <glob pattern="*.m4a"/>
-    <glob pattern="*.aac"/>
+    <glob pattern="*.f4a"/>
   </mime-type>
   <mime-type type="video/mp4">
     <_comment>MPEG-4 video</_comment>

diff --git a/packaging/shared-mime-info.spec b/packaging/shared-mime-info.spec
index 54e311d..3c915dc 100644 (file)
--- a/packaging/shared-mime-info.spec
+++ b/packaging/shared-mime-info.spec
@@ -1,7 +1,7 @@
 Name:       shared-mime-info
 Summary:    FreeDesktop.org shared MIME database and spec
 Version:    0.60
-Release:    8
+Release:    9
 Group:      misc
 License:    GPLv2
 Source0:    shared-mime-info-0.60.tar.gz