SPECS: xmms-crossfade.spec - updated only-libs patch to avoid BRin...

[qboosh]

Author: qboosh                       Date: Wed Dec 26 02:23:00 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated only-libs patch to avoid BRing plugins trees
- more deps (pkgconfig, libsamplerate-devel)
- no need to copy sources, just use separate builddirs

---- Files affected:
SPECS:
   xmms-crossfade.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: SPECS/xmms-crossfade.spec
diff -u SPECS/xmms-crossfade.spec:1.37 SPECS/xmms-crossfade.spec:1.38
--- SPECS/xmms-crossfade.spec:1.37	Fri Nov 23 22:56:37 2007
+++ SPECS/xmms-crossfade.spec	Wed Dec 26 03:22:55 2007
@@ -1,8 +1,8 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	xmms		# without xmms plugin
 %bcond_without	audacious	# without audacious plugin
+%bcond_without	xmms		# without xmms plugin
 #
 Summary:	Plugin for Crossfading and Continuous Output
 Summary(pl.UTF-8):	Wtyczka wyjściowa zapewniająca dźwięk bez przerw
@@ -15,17 +15,18 @@
 # Source0-md5:	11a6a5456f83310fc4325806272db78b
 Patch0:		%{name}-only-libs.patch
 URL:		http://www.eisenlohr.org/xmms-crossfade/
-BuildRequires:	audacious-devel
-BuildRequires:	autoconf
+%{?with_audacious:BuildRequires:	audacious-devel >= 1.4.2}
+BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
 BuildRequires:	gtk+-devel
 BuildRequires:	gtk+2-devel
+BuildRequires:	libsamplerate-devel
 BuildRequires:	libtool
+BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.125
 %{?with_xmms:BuildRequires:	xmms-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-
 %description
 xmms-crossfade features:
 - Crossfading: Crossfade between two songs, i.e. fade out the end of
@@ -170,29 +171,25 @@
 %setup -q
 %patch0 -p1
 
-mkdir audacious
-cp -r * audacious/ || /bin/true
-
 %build
-%if %{with xmms}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
 
-%configure \
+%if %{with xmms}
+mkdir -p xmms
+cd xmms
+../%configure \
 	--enable-player=xmms
 %{__make}
+cd ..
 %endif
 
 %if %{with audacious}
+mkdir -p audacious
 cd audacious
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-
-%configure \
+../%configure \
 	--enable-player=audacious
 %{__make}
 %endif
@@ -201,13 +198,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with xmms}
-%{__make} install \
+%{__make} -C xmms install \
 	DESTDIR=$RPM_BUILD_ROOT
 %endif
 
 %if %{with audacious}
-cd audacious
-%{__make} install \
+%{__make} -C audacious install \
 	DESTDIR=$RPM_BUILD_ROOT
 %endif
 
@@ -234,6 +230,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2007-12-26 02:22:55  qboosh
+- updated only-libs patch to avoid BRing plugins trees
+- more deps (pkgconfig, libsamplerate-devel)
+- no need to copy sources, just use separate builddirs
+
 Revision 1.37  2007-11-23 21:56:37  wolf
 - fixed audacious files
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xmms-crossfade.spec?r1=1.37&r2=1.38&f=u