SPECS: amarok.spec - up to 1.4.1-beta1 - enabled visualizations wi...

[shadzik]

Author: shadzik                      Date: Mon Jun 19 06:27:08 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.4.1-beta1
- enabled visualizations with libvisual >= 0.4.0
- sed -> %{__sed}

---- Files affected:
SPECS:
   amarok.spec (1.112 -> 1.113) 

---- Diffs:

================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.112 SPECS/amarok.spec:1.113
--- SPECS/amarok.spec:1.112	Tue Jun  6 13:11:34 2006
+++ SPECS/amarok.spec	Mon Jun 19 08:27:03 2006
@@ -25,14 +25,14 @@
 Summary:	A KDE audio player
 Summary(pl):	Odtwarzacz audio dla KDE
 Name:		amarok
-%define		_ver 1.4.0
-%define		_rel a
-Version:	%{_ver}%{_rel}
-Release:	1
+%define		_ver 1.4.1
+%define		_rel beta1
+Version:	%{_ver}
+Release:	0.%{_rel}.1
 License:	GPL
 Group:		X11/Applications/Multimedia
-Source0:	http://dl.sourceforge.net/amarok/%{name}-%{version}.tar.bz2
-# Source0-md5:	3ceffe6465290eef618861cdb81b420a
+Source0:	http://dl.sourceforge.net/amarok/%{name}-%{_ver}-%{_rel}.tar.bz2
+# Source0-md5:	ee043cf6efa3f2ac7b470eb6c050c0f7
 Patch0:		%{name}-helixplayer-morearchs.patch
 URL:		http://amarok.kde.org/
 BuildRequires:	SDL-devel
@@ -50,8 +50,7 @@
 BuildRequires:	libltdl-devel
 %{?with_pgsql:BuildRequires:		libpqxx-devel}
 BuildRequires:	libtunepimp-devel >= 0.4.0
-#BuildRequires:	libvisual-devel >= 0.2.0
-#BuildRequires:	libvisual-devel < 0.3
+BuildRequires:	libvisual-devel >= 0.4.0
 BuildRequires:	mpeg4ip-devel
 %{?with_mysql:BuildRequires:		mysql-devel}
 BuildRequires:	pcre-devel
@@ -192,16 +191,16 @@
 <http://amarok.kde.org/amarokwiki/index.php/Script-Writing_HowTo>.
 
 %prep
-%setup -q -n %{name}-%{_ver}
+%setup -q -n %{name}-%{_ver}-%{_rel}
 %patch0 -p1
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \
 	amarok/src/amarok.desktop \
 
 # see kde bug #110909
-sed -i -e 's/amarok_live//' amarok/src/scripts/Makefile.am
+%{__sed} -i -e 's/amarok_live//' amarok/src/scripts/Makefile.am
 
 # kill env, call interpreter directly, so rpm automatics could rule
-sed -i -e '
+%{__sed} -i -e '
 	1s,#!.*bin/env.*ruby,#!%{_bindir}/ruby,
 	1s,#!.*bin/env.*python,#!%{_bindir}/python,
 	1s,#!.*bin/env.*bash,#!/bin/bash,
@@ -225,7 +224,6 @@
 	--with%{!?with_nmm:out}-nmm \
 	--with%{!?with_mp3players:out}-libgpod \
 	--with%{!?with_mp3players:out}-ifp \
-	--without-libvisual \
 	--%{?with_mysql:en}%{!?with_mysql:dis}able-mysql \
 	--%{?with_mysql:en}%{!?with_mysql:dis}able-postgresql \
 	--disable-final \
@@ -251,10 +249,10 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#if [ "$1" = 1 ]; then
-#	echo "Remember to install libvisual-plugins-* packages if you"
-#	echo "want to have a visualizations in amaroK."
-#fi
+if [ "$1" = 1 ]; then
+	echo "Remember to install libvisual-plugins-* packages if you"
+	echo "want to have a visualizations in amaroK."
+fi
 
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
@@ -265,7 +263,7 @@
 %attr(755,root,root) %{_bindir}/amarok
 %attr(755,root,root) %{_bindir}/amarokapp
 %attr(755,root,root) %{_bindir}/amarokcollectionscanner
-#%attr(755,root,root) %{_bindir}/amarok_libvisual
+%attr(755,root,root) %{_bindir}/amarok_libvisual
 %attr(755,root,root) %{_libdir}/libamarok.so.*.*.*
 %{_libdir}/kde3/konqsidebar_universalamarok.la
 %attr(755,root,root) %{_libdir}/kde3/konqsidebar_universalamarok.so
@@ -430,6 +428,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.113  2006/06/19 06:27:03  shadzik
+- up to 1.4.1-beta1
+- enabled visualizations with libvisual >= 0.4.0
+- sed -> %{__sed}
+
 Revision 1.112  2006/06/06 11:11:34  qboosh
 - Obsoletes: amarok-arts
 - not ready for libvisual > 0.2 - disable it
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/amarok.spec?r1=1.112&r2=1.113&f=u