SPECS: amarok.spec - merged from DEVEL - mp3players disabled, libg...

[wolf]

Author: wolf                         Date: Thu Aug 24 17:43:33 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL
- mp3players disabled, libgpod is broken

---- Files affected:
SPECS:
   amarok.spec (1.127 -> 1.128) 

---- Diffs:

================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.127 SPECS/amarok.spec:1.128
--- SPECS/amarok.spec:1.127	Wed Aug 23 22:29:14 2006
+++ SPECS/amarok.spec	Thu Aug 24 19:43:28 2006
@@ -14,7 +14,7 @@
 %bcond_without	zeroconf	# disable support for zeroconf
 %bcond_without	included_sqlite # don't use included sqlite (VERY BAD IDEA), needs sqlite >= 3.3 otherwise
 %bcond_without	helix		# disable HelixPlayer engine
-%bcond_without	mp3players	# disable iPod and iRiver MP3 players support
+%bcond_with	mp3players	# disable iPod and iRiver MP3 players support
 %bcond_with	nmm		# enable NMM audio backend
 %bcond_with	mysql		# enable MySQL support
 %bcond_with	pgsql		# enable PostgreSQL support
@@ -27,7 +27,7 @@
 Summary(pl):	Odtwarzacz audio dla KDE
 Name:		amarok
 Version:	1.4.2
-Release:	0.1
+Release:	1
 License:	GPL
 Group:		X11/Applications/Multimedia
 #Source0:	http://dl.sourceforge.net/amarok/%{name}-%{version}.tar.bz2
@@ -269,6 +269,8 @@
 %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_proxy.rb
+%attr(755,root,root) %{_bindir}/amarok_daapserver.rb
 %attr(755,root,root) %{_libdir}/libamarok.so.*.*.*
 %{_libdir}/kde3/konqsidebar_universalamarok.la
 %attr(755,root,root) %{_libdir}/kde3/konqsidebar_universalamarok.so
@@ -277,8 +279,17 @@
 %{_libdir}/kde3/libamarok_void-engine_plugin.la
 %attr(755,root,root) %{_libdir}/kde3/libamarok_void-engine_plugin.so
 %{_libdir}/libamarok.la
+%{_libdir}/kde3/libamarok_daap-mediadevice.la
+%attr(755,root,root) %{_libdir}/kde3/libamarok_daap-mediadevice.so
+%{_libdir}/kde3/libamarok_massstorage-device.la
+%attr(755,root,root) %{_libdir}/kde3/libamarok_massstorage-device.so
+%{_libdir}/kde3/libamarok_nfs-device.la
+%attr(755,root,root) %{_libdir}/kde3/libamarok_nfs-device.so
+%{_libdir}/kde3/libamarok_smb-device.la
+%attr(755,root,root) %{_libdir}/kde3/libamarok_smb-device.so
 %dir %{_datadir}/apps/amarok
 %dir %{_datadir}/apps/amarok/scripts
+%{_datadir}/apps/amarok/ruby_lib
 %{_datadir}/apps/amarok/*.rc
 %{_datadir}/apps/amarok/data
 %{_datadir}/apps/amarok/icons
@@ -293,7 +304,13 @@
 %{_datadir}/config.kcfg/amarok.kcfg
 %{_datadir}/services/amarok_generic-mediadevice.desktop
 %{_datadir}/services/amarok_void-engine_plugin.desktop
-#%{_datadir}/services/lastfm.protocol
+%{_datadir}/services/amarok_daap-mediadevice.desktop
+%{_datadir}/services/amarok_massstorage-device.desktop
+%{_datadir}/services/amarok_nfs-device.desktop
+%{_datadir}/services/amarok_smb-device.desktop
+%{_datadir}/services/amaroklastfm.protocol
+%{_datadir}/services/amarokitpc.protocol
+%{_datadir}/services/amarokpcast.protocol
 %{_datadir}/servicetypes/amarok_codecinstall.desktop
 %{_datadir}/servicetypes/amarok_plugin.desktop
 %{_desktopdir}/kde/amarok.desktop
@@ -448,6 +465,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.128  2006/08/24 17:43:28  wolf
+- merged from DEVEL
+- mp3players disabled, libgpod is broken
+
 Revision 1.127  2006/08/23 20:29:14  wolf
 - 1.4.2, not finished
 
================================================================

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