add mime type for *.m3u files; rel 4

submitted upstream: https://bugs.astron.com/view.php?id=488

diff --git a/file.spec b/file.spec
index 6c3434ac4be0451158851f2b37e78b62948e2226..4af0c2852795a049c8aa4abfe6e681581990d86f 100644 (file)
--- a/file.spec
+++ b/file.spec
@@ -35,7 +35,7 @@ Summary(zh_CN.UTF-8): 判定文件类型的工具。
 Summary(zh_TW.UTF-8):  用於決定檔案類型的一個工具程式。
 Name:          file
 Version:       5.45
 Summary(zh_TW.UTF-8):  用於決定檔案類型的一個工具程式。
 Name:          file
 Version:       5.45

-Release:       3
+Release:       4

 License:       distributable
 Group:         Applications/File
 Source0:       ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
 License:       distributable
 Group:         Applications/File
 Source0:       ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz


@@ -50,6 +50,7 @@ Patch1:               automake.patch
 Patch2:                %{name}-gettext-no-random-translations.patch
 Patch3:                name-use-count.patch
 Patch4:                time_t-32bit.patch
 Patch2:                %{name}-gettext-no-random-translations.patch
 Patch3:                name-use-count.patch
 Patch4:                time_t-32bit.patch

+Patch5:                m3u-mime-type.patch

 URL:           http://www.darwinsys.com/file/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 URL:           http://www.darwinsys.com/file/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake


@@ -292,6 +293,7 @@ Wiązania Pythona 3 do biblioteki libmagic.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1

+%patch5 -p1

 
 %if "%{_ver_lt '%{cc_version}' '3.4'}" == "1"
 %{__sed} -i -e 's,-Wextra,,' configure.ac
 
 %if "%{_ver_lt '%{cc_version}' '3.4'}" == "1"
 %{__sed} -i -e 's,-Wextra,,' configure.ac


@@ -344,7 +346,7 @@ install -d $RPM_BUILD_ROOT/%{_lib}
 
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/libmagic.so.* $RPM_BUILD_ROOT/%{_lib}
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libmagic.so.*.*.*) \
 
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/libmagic.so.* $RPM_BUILD_ROOT/%{_lib}
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libmagic.so.*.*.*) \

-        $RPM_BUILD_ROOT%{_libdir}/libmagic.so
+       $RPM_BUILD_ROOT%{_libdir}/libmagic.so

 
 %if %{with python2}
 cd python
 
 %if %{with python2}
 cd python

diff --git a/m3u-mime-type.patch b/m3u-mime-type.patch
new file mode 100644 (file)
index 0000000..4fead64
--- /dev/null
+++ b/m3u-mime-type.patch
@@ -0,0 +1,12 @@
+diff --git a/magic/Magdir/audio b/magic/Magdir/audio
+index b99a15c4..7d32fe45 100644
+--- a/magic/Magdir/audio
++++ b/magic/Magdir/audio
+@@ -644,6 +644,7 @@
+ 0     string  [Equalizer\ preset]     XMMS equalizer preset
+ # .m3u
+ 0     search/1        #EXTM3U         M3U playlist text
++!:mime  audio/x-mpegurl
+ # .pls
+ 0     search/1        [playlist]      PLS playlist text
+ # licq.conf