rpms/xmms-crossfade/devel xmms-crossfade-0.3.14-libexec.patch, NONE, 1.1 xmms-crossfade.spec, 1.19, 1.20

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/xmms-crossfade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2590/devel

Modified Files:
	xmms-crossfade.spec 
Added Files:
	xmms-crossfade-0.3.14-libexec.patch 
Log Message:
Update to 0.3.14 for F-10 and F-11, with minor fixes.


xmms-crossfade-0.3.14-libexec.patch:
 configure    |    2 +-
 configure.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xmms-crossfade-0.3.14-libexec.patch ---
diff -Naupr xmms-crossfade-0.3.14.orig/configure xmms-crossfade-0.3.14/configure
--- xmms-crossfade-0.3.14.orig/configure	2007-11-26 01:14:07.000000000 +0100
+++ xmms-crossfade-0.3.14/configure	2007-11-26 01:14:07.000000000 +0100
@@ -20650,7 +20650,7 @@ NOTE: If you installed XMMS as a RPM and
 	fi
 
 	PLAYER_GTK2=
-	PLAYER_BIN="$XMMS"
+	PLAYER_BIN="/usr/libexec/xmms"
 	PLAYER_BASENAME="xmms"
 	PLAYER_CONFIG="$XMMS_CONFIG"
 	PLAYER_CONFIG_OUTPUT_PLUGIN_DIR="$PLAYER_CONFIG --output-plugin-dir"
diff -Naupr xmms-crossfade-0.3.14.orig/configure.in xmms-crossfade-0.3.14/configure.in
--- xmms-crossfade-0.3.14.orig/configure.in	2007-11-26 01:13:58.000000000 +0100
+++ xmms-crossfade-0.3.14/configure.in	2007-11-26 01:13:58.000000000 +0100
@@ -103,7 +103,7 @@ NOTE: If you installed XMMS as a RPM and
 	fi
 
 	PLAYER_GTK2=
-	PLAYER_BIN="$XMMS"
+	PLAYER_BIN="/usr/libexec/xmms"
 	PLAYER_BASENAME="xmms"
 	PLAYER_CONFIG="$XMMS_CONFIG"
 	PLAYER_CONFIG_OUTPUT_PLUGIN_DIR="$PLAYER_CONFIG --output-plugin-dir"


Index: xmms-crossfade.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/devel/xmms-crossfade.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xmms-crossfade.spec	12 Sep 2009 21:15:11 -0000	1.19
+++ xmms-crossfade.spec	14 Sep 2009 21:24:24 -0000	1.20
@@ -12,9 +12,13 @@ License: GPLv2+
 Group: Applications/Multimedia
 URL: http://www.eisenlohr.org/xmms-crossfade/
 Source: http://www.eisenlohr.org/xmms-crossfade/xmms-crossfade-%{version}.tar.gz
+Patch0: xmms-crossfade-0.3.14-libexec.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: xmms >= 1:1.2.10-20
-BuildRequires: xmms, xmms-devel, libsamplerate-devel
+BuildRequires: xmms
+BuildRequires: xmms-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: id3lib-devel
 
 %description
 A plugin for XMMS featuring crossfading, continuous output between songs and
@@ -33,16 +37,21 @@ songs and a gap-killer.
 
 %prep
 %setup -q -T -b 0
-# extract tarball 2nd time for audacious plugin build
+%patch0 -p1 -b .libexec
+# Convert docs to UTF-8
+for f in ChangeLog README; do
+  iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
+done
+# Extract tarball a second time for audacious plugin build
 mkdir %{audacious_builddir} ; tar xfz %{SOURCE0} -C %{audacious_builddir}
 
 
 %build
-%configure --enable-player=xmms --libdir=%{xmms_outputdir}
+%configure --enable-id3 --enable-player=xmms --libdir=%{xmms_outputdir}
 %{__make} %{?_smp_mflags}
 
 cd %{audacious_builddir}/%{name}-%{version}
-%configure --enable-player=audacious --libdir=%{audacious_outputdir}
+%configure --enable-id3 --enable-player=audacious --libdir=%{audacious_outputdir}
 %{__make} %{?_smp_mflags}
 cd -
 
@@ -75,6 +84,11 @@ cd -
 
 
 %changelog
+* Mon Sep 14 2009 Matthias Saou <http://freshrpms.net/> 0.3.14-2
+- Include patch for configure to check /usr/libexec/xmms for strings.
+- Convert ChangeLog and README to UTF-8.
+- Enable id3lib support for reading track number.
+
 * Wed Aug 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.3.14-1
 - Also build Audacious plugin.