[xmms/f19] fix mikmod support (thanks to Ozkan Sezer), fix serbian translation dir (thanks to Mike FABIAN)
Tom Callaway
spot at fedoraproject.org
Tue Feb 11 15:39:57 UTC 2014
commit 4eae33eef3a67d92533934c29b4dab5723992af5
Author: Tom Callaway <spot at fedoraproject.org>
Date: Tue Feb 11 10:40:35 2014 -0500
fix mikmod support (thanks to Ozkan Sezer), fix serbian translation dir (thanks to Mike FABIAN)
xmms-1.2.11-mikmod-fix.patch | 19 +++++++++++++++++++
xmms.spec | 14 +++++++++++++-
2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/xmms-1.2.11-mikmod-fix.patch b/xmms-1.2.11-mikmod-fix.patch
new file mode 100644
index 0000000..fa0de37
--- /dev/null
+++ b/xmms-1.2.11-mikmod-fix.patch
@@ -0,0 +1,19 @@
+diff -up xmms-1.2.11-20071117cvs/Input/mikmod/drv_xmms.c.fix xmms-1.2.11-20071117cvs/Input/mikmod/drv_xmms.c
+--- xmms-1.2.11-20071117cvs/Input/mikmod/drv_xmms.c.fix 2014-02-11 10:33:47.944425895 -0500
++++ xmms-1.2.11-20071117cvs/Input/mikmod/drv_xmms.c 2014-02-11 10:34:39.000359857 -0500
+@@ -124,7 +124,15 @@ MDRIVER drv_xmms =
+ "xmms output driver v1.0",
+ 0, 255,
+ #if (LIBMIKMOD_VERSION > 0x030106)
++/* Alias string */
+ "xmms",
++#endif
++#if (LIBMIKMOD_VERSION >= 0x030200)
++/* CmdLineHelp string */
++ NULL,
++#endif
++#if (LIBMIKMOD_VERSION > 0x030106)
++/* CommandLine proc */
+ NULL,
+ #endif
+ xmms_IsThere,
diff --git a/xmms.spec b/xmms.spec
index 488a192..d53e232 100644
--- a/xmms.spec
+++ b/xmms.spec
@@ -1,6 +1,6 @@
Name: xmms
Version: 1.2.11
-Release: 18.20071117cvs%{?dist}
+Release: 20.20071117cvs%{?dist}
Epoch: 1
Summary: The X MultiMedia System, a media player
@@ -35,6 +35,7 @@ Patch15: %{name}-1.2.10-reposition.patch
Patch16: %{name}-1.2.11-dso.patch
Patch17: xmms-1.2.10-ubuntu-CVE-2007-0653.patch
Patch18: xmms-alsa-fix-loop.patch
+Patch19: xmms-1.2.11-mikmod-fix.patch
# This plugin is gone. Esound is gone. 2001 is gone.
Provides: xmms-esd = %{epoch}:%{version}-%{release}
@@ -111,6 +112,7 @@ Files needed for building plug-ins for the X MultiMedia System.
%patch16 -p1 -b .dso
%patch17 -p1 -b .CVE-2007-0653
%patch18 -p1 -b .fix-loop
+%patch19 -p1 -b .mikmod-fix
# Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it
sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure
@@ -142,6 +144,9 @@ install -pm 755 librh_mp3.so %{buildroot}%{_libdir}/xmms/Input
install -dm 755 %{buildroot}%{_datadir}/xmms/Skins
find %{buildroot} -name "*.la" | xargs rm -f
+# Fix translation directory
+mv %{buildroot}/%{_datadir}/locale/sr at Latn %{buildroot}/%{_datadir}/locale/sr at latin
+
# On FC5 x86_64, some get created even though we pass --disable-static
rm -f %{buildroot}%{_libdir}/xmms/*/*.a
@@ -218,6 +223,13 @@ update-desktop-database &>/dev/null || :
%changelog
+* Tue Feb 11 2014 Tom Callaway <spot at fedoraproject.org> - 1:1.2.11-20.20071117cvs
+- fix mikmod support (thanks to Ozkan Sezer)
+- fix serbian translation dir (thanks to Mike FABIAN)
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.11-19.20071117cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Thu Feb 14 2013 Tom Callaway <spot at fedoraproject.org> - 1:1.2.11-18.20071117cvs
- drop esound support (esound is dead dead dead)
More information about the scm-commits
mailing list