rpms/amarok/devel amarok.spec,1.17,1.18

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6665/devel

Modified Files:
	amarok.spec 
Log Message:
- disable the akode engine (disabled upstream, see Changelog)
- merge in the Helix engine, since it does not have special Requires.
  HelixPlayer or RealPlayer need to be installed manually (either one)
- updated description




Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- amarok.spec	22 Aug 2005 13:35:52 -0000	1.17
+++ amarok.spec	22 Aug 2005 14:23:41 -0000	1.18
@@ -7,7 +7,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.3
-Release:    1%{?dist}
+Release:    2%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -42,11 +42,16 @@
 %description
 Amarok is a KDE multimedia player with:
  - fresh playlist concept, very fast to use, with drag and drop
- - plays all formats supported by aRts, gstreamer or xine
+ - plays all formats supported by the various engines
  - audio effects, like reverb and compressor
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
+Amarok can use various engines to decode sound : gstreamer, arts,
+helix and xine (disabled by default for patent reasons)
+To use the helix engine, you'll have to install either HelixPlayer
+or RealPlayer
+
 
 %package visualisation
 Summary:    Visualisation plugins for Amarok
@@ -59,28 +64,16 @@
 use any of xmms' visualisation plugins with Amarok.
 
 
-%if "%fedora" >= "4"
-%package akode
-Summary:    AKode engine for Amarok
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}
-
-%description akode
-Amarok can also use the akode engine to decode sound. This package
-enables it.
-%endif
-
-
-%package helix
-Summary:    Helix engine for Amarok
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}
-
-%description helix
-Amarok can also use the helix engine to decode sound. This package
-enables it.
-To use the helix engine, you'll have to install either HelixPlayer
-or RealPlayer
+#%if "%fedora" >= "4"
+#%package akode
+#Summary:    AKode engine for Amarok
+#Group:      Applications/Multimedia
+#Requires:   %{name} = %{version}
+#
+#%description akode
+#Amarok can also use the akode engine to decode sound. This package
+#enables it.
+#%endif
 
 
 %if 0%{?use_xine}
@@ -193,9 +186,14 @@
 %{_datadir}/config/amarokrc
 %{_datadir}/config.kcfg/*.kcfg
 %{_datadir}/doc/HTML/*/amarok
+# Arts engine
 %{_libdir}/libamarokarts*
 %{_libdir}/kde3/libamarok_artsengine_plugin.*
 %{_datadir}/services/amarok_artsengine_plugin.desktop
+# Helix engine
+%{_libdir}/kde3/libamarok_helixengine_plugin.*
+%{_datadir}/services/amarok_helixengine_plugin.desktop
+
 %exclude %{_datadir}/apps/zeroconf/_shoutcast._tcp
 
 
@@ -205,18 +203,14 @@
 %{_bindir}/amarok_xmmswrapper2
 
 
-%if "%fedora" >= "4"
-%files akode
-%defattr(-,root,root)
-%{_libdir}/kde3/libamarok_aKode-engine.*
-%{_datadir}/services/amarok_aKode-engine.desktop
-%endif
+#%if "%fedora" >= "4"
+#%files akode
+#%defattr(-,root,root)
+#%{_libdir}/kde3/libamarok_aKode-engine.*
+#%{_datadir}/services/amarok_aKode-engine.desktop
+#%endif
 
 
-%files helix
-%defattr(-,root,root)
-%{_libdir}/kde3/libamarok_helixengine_plugin.*
-%{_datadir}/services/amarok_helixengine_plugin.desktop
 
 
 %if 0%{?use_xine}
@@ -229,6 +223,12 @@
 
 
 %changelog
+* Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3-2
+- disable the akode engine (disabled upstream, see Changelog)
+- merge in the Helix engine, since it does not have special Requires.
+  HelixPlayer or RealPlayer need to be installed manually (either one)
+- updated description
+
 * Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3-1
 - update to version 1.3
 - add Michel Salim's improvements: