rpms/xmms-crossfade/F-10 xmms-crossfade-0.3.14-libexec.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xmms-crossfade.spec, 1.16, 1.17

[Matthias Saou]

Author: thias

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

Modified Files:
	.cvsignore sources 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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	6 Aug 2007 08:45:37 -0000	1.7
+++ .cvsignore	14 Sep 2009 21:24:21 -0000	1.8
@@ -1 +1 @@
-xmms-crossfade-0.3.12.tar.gz
+xmms-crossfade-0.3.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Aug 2007 08:45:37 -0000	1.7
+++ sources	14 Sep 2009 21:24:21 -0000	1.8
@@ -1 +1 @@
-fe009c43948d01347e4ecdf8e5fe39bf  xmms-crossfade-0.3.12.tar.gz
+026c52544c7f3193d384288c9f8296aa  xmms-crossfade-0.3.14.tar.gz


Index: xmms-crossfade.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/F-10/xmms-crossfade.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- xmms-crossfade.spec	20 Feb 2008 04:48:54 -0000	1.16
+++ xmms-crossfade.spec	14 Sep 2009 21:24:21 -0000	1.17
@@ -1,35 +1,69 @@
 %define xmms_outputdir %(xmms-config --output-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/Output)
 
+%define audacious_outputdir %(pkg-config audacious --variable=output_plugin_dir)
+
+%define audacious_builddir audacious-crossfade-build
+
 Summary: Audio crossfade plugin for XMMS
 Name: xmms-crossfade
-Version: 0.3.12
-Release: 3
+Version: 0.3.14
+Release: 1%{?dist}
 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
 a gap-killer.
 
 
+%package -n audacious-plugins-crossfade
+Summary: Audio crossfade plugin for Audacious
+Requires: audacious
+BuildRequires: audacious, audacious-devel
+
+%description -n audacious-plugins-crossfade
+A plugin for Audacious featuring crossfading, continuous output between
+songs and a gap-killer.
+
+
 %prep
-%setup -q
+%setup -q -T -b 0
+%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 --libdir=%{xmms_outputdir}
+%configure --enable-id3 --enable-player=xmms --libdir=%{xmms_outputdir}
 %{__make} %{?_smp_mflags}
 
+cd %{audacious_builddir}/%{name}-%{version}
+%configure --enable-id3 --enable-player=audacious --libdir=%{audacious_outputdir}
+%{__make} %{?_smp_mflags}
+cd -
+
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
+cd %{audacious_builddir}/%{name}-%{version}
+%{__make} install DESTDIR=%{buildroot}
+cd -
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -42,7 +76,25 @@ a gap-killer.
 %{xmms_outputdir}/libcrossfade.so
 
 
+%files -n audacious-plugins-crossfade
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README
+%exclude %{audacious_outputdir}/libcrossfade.la
+%{audacious_outputdir}/libcrossfade.so
+
+
 %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.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.12-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.3.12-3
 - Autorebuild for GCC 4.3