From efe8d228a75cb761fa1d5bb7d3f3a20b19f728ba Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 10 Apr 2009 15:17:17 +0000 Subject: [PATCH] * Fri Apr 10 2009 Rex Dieter - 1.1.16.3-2 - fix modtracker mimetypes --- xine-lib-1.1.16.3-mod_mimetypes_typo.patch | 20 ++++++++++++++++++++ xine-lib.spec | 8 +++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 xine-lib-1.1.16.3-mod_mimetypes_typo.patch diff --git a/xine-lib-1.1.16.3-mod_mimetypes_typo.patch b/xine-lib-1.1.16.3-mod_mimetypes_typo.patch new file mode 100644 index 0000000..b10fabb --- /dev/null +++ b/xine-lib-1.1.16.3-mod_mimetypes_typo.patch @@ -0,0 +1,20 @@ +diff -up xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo xine-lib-1.1.16.3/src/demuxers/demux_mod.c +--- xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo 2009-03-25 14:28:40.000000000 -0500 ++++ xine-lib-1.1.16.3/src/demuxers/demux_mod.c 2009-04-10 10:15:04.000000000 -0500 +@@ -387,11 +387,11 @@ static const char *get_mimetypes (demux_ + "audio/x-s3m: s3m: ScreamTracker 3 Module;" + "audio/s3m: s3m: ScreamTracker 3 Module;" + "application/playerpro: 669: 669 Tracker Module;" +- "application/adrift; amf: ADRIFT Module File;" +- "audio/med; med; Amiga MED/OctaMED Tracker Module Sound File;" +- "audio/x-amf; amf: ADRIFT Module File;" +- "audio/x-xm; xm: FastTracker II Audio;" +- "audio/xm; xm: FastTracker II Audio;"; ++ "application/adrift: amf: ADRIFT Module File;" ++ "audio/med: med: Amiga MED/OctaMED Tracker Module Sound File;" ++ "audio/x-amf: amf: ADRIFT Module File;" ++ "audio/x-xm: xm: FastTracker II Audio;" ++ "audio/xm: xm: FastTracker II Audio;"; + } + + static void class_dispose (demux_class_t *this_gen) { diff --git a/xine-lib.spec b/xine-lib.spec index 7893457..253bd5f 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -34,7 +34,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.16.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -55,6 +55,8 @@ Patch7: %{name}-1.1.16-old-caca.patch Patch8: xine-lib-1.1.15-avsync_hack.patch # http://bugzilla.redhat.com/477226 Patch9: xine-lib-1.1.16.2-multilib.patch +## upstreamable patches +Patch50: xine-lib-1.1.16.3-mod_mimetypes_typo.patch ## upstream patches Provides: xine-lib(plugin-abi) = %{plugin_abi} @@ -207,6 +209,7 @@ sed -i -e 's/caca >= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure %patch8 -p1 -b .avsync_hack %patch9 -p1 -b .multilib +%patch50 -p1 -b .mod_mimetypes_typo # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex ) #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure @@ -439,6 +442,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Apr 10 2009 Rex Dieter - 1.1.16.3-2 +- fix modtracker mimetypes + * Fri Apr 03 2009 Rex Dieter - 1.1.16.3-1 - xine-lib-1.1.16.3, plugin-abi 1.26