SPECS: amarok.spec - Obsoletes: amarok-arts - not ready for libvis...

[qboosh]

Author: qboosh                       Date: Tue Jun  6 11:11:39 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Obsoletes: amarok-arts
- not ready for libvisual > 0.2 - disable it

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

---- Diffs:

================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.111 SPECS/amarok.spec:1.112
--- SPECS/amarok.spec:1.111	Mon Jun  5 18:37:48 2006
+++ SPECS/amarok.spec	Tue Jun  6 13:11:34 2006
@@ -15,8 +15,8 @@
 %bcond_without	helix		# disable HelixPlayer engine
 %bcond_without	mp3players	# disable iPod and iRiver MP3 players support
 %bcond_with	nmm             # enable NMM audio backend
-%bcond_with	mysql		# enable mysql support
-%bcond_with	pgsql		# enables postgresql support
+%bcond_with	mysql		# enable MySQL support
+%bcond_with	pgsql		# enable PostgreSQL support
 #
 %ifarch i386
 %undefine	with_helix
@@ -42,7 +42,6 @@
 BuildRequires:	dbus-glib-devel
 BuildRequires:	gettext-devel
 %{?with_gstreamer:BuildRequires:	gstreamer-devel >= 0.10.0}
-BuildRequires:	gtk+2-devel
 BuildRequires:	kdebase-devel
 %{?with_akode:BuildRequires:	kdemultimedia-akode}
 BuildRequires:	kdemultimedia-devel >= 9:3.1.93
@@ -51,7 +50,8 @@
 BuildRequires:	libltdl-devel
 %{?with_pgsql:BuildRequires:		libpqxx-devel}
 BuildRequires:	libtunepimp-devel >= 0.4.0
-BuildRequires:	libvisual-devel >= 0.2.0
+#BuildRequires:	libvisual-devel >= 0.2.0
+#BuildRequires:	libvisual-devel < 0.3
 BuildRequires:	mpeg4ip-devel
 %{?with_mysql:BuildRequires:		mysql-devel}
 BuildRequires:	pcre-devel
@@ -66,6 +66,7 @@
 Requires:	%{name}-plugin = %{version}-%{release}
 Requires:	kdebase-core >= 9:3.1.93
 Requires:	kdemultimedia-audiocd >= 9:3.1.93
+Obsoletes:	amarok-arts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -224,6 +225,7 @@
 	--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 \
@@ -249,13 +251,12 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-if [ "$1" = 1 ]; then
-	echo "Remember to install libvisual-plugins-* packages if you"
-	echo "want to have a visualizations in amaroK."
-fi
-/sbin/ldconfig
+#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
 
 %files -f %{name}.lang
@@ -429,6 +430,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.112  2006/06/06 11:11:34  qboosh
+- Obsoletes: amarok-arts
+- not ready for libvisual > 0.2 - disable it
+
 Revision 1.111  2006/06/05 16:37:48  glen
 - merged 1.4.0a from DEVEL
 
================================================================

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