[xmms-crossfade] fix FTBFS, drop old broken audacious plugin (there is a _MUCH_ better crossfade effect plugin in aud

Tom Callaway spot at fedoraproject.org
Thu Mar 8 20:21:09 UTC 2012


commit 956b9803bf5c73dc8561976a47fc3c1aea2a5420
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu Mar 8 15:21:06 2012 -0500

    fix FTBFS, drop old broken audacious plugin (there is a _MUCH_ better crossfade effect plugin in audacious-plugins)

 xmms-crossfade.spec |   56 +++++++++-----------------------------------------
 1 files changed, 10 insertions(+), 46 deletions(-)
---
diff --git a/xmms-crossfade.spec b/xmms-crossfade.spec
index 91be179..bda0fae 100644
--- a/xmms-crossfade.spec
+++ b/xmms-crossfade.spec
@@ -1,13 +1,9 @@
 %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.14
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://www.eisenlohr.org/xmms-crossfade/
@@ -19,71 +15,39 @@ BuildRequires: xmms
 BuildRequires: xmms-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: id3lib-devel
+BuildRequires: autoconf, automake, libtool
 
 %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 -T -b 0
 %patch0 -p1 -b .libexec
+autoreconf -i -f -v
 # 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-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 -
-
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
-
-cd %{audacious_builddir}/%{name}-%{version}
-%{__make} install DESTDIR=%{buildroot}
-cd -
-
-
-%clean
-%{__rm} -rf %{buildroot}
-
+make install DESTDIR=%{buildroot}
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %exclude %{xmms_outputdir}/libcrossfade.la
 %{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
+* Thu Mar  8 2012 Tom Callaway <spot at fedoraproject.org> - 0.3.14-5
+- fix FTBFS
+- drop broken old audacious plugin 
+  (there is a _MUCH_ better crossfade effect plugin in audacious-plugins)
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.14-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list