- updated to 2.1

- moved form DEVEL
- now package status is stable

Changed files:
    amarok.spec -> 1.202

diff --git a/amarok.spec b/amarok.spec
index 3b0a0c1a6f201d07febe782dbdfe40a09d6c0a35..7ded6b5693a5767dde0b4bc6950493706332fc79 100644 (file)
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,90 +1,76 @@
-# TODO:
-# - postgresql support alongside mysql
-# - NMM audio backend support (fix build - propably some BRs)
-# - make descriptions less useless
-# - track http://websvn.kde.org/trunk/extragear/multimedia/amarok/TODO?rev=470324&r1=470292&r2=470324
-# - include /usr/bin/amarok_proxy.rb (proxy server for last.fm, but req. ruby)
-# - main package pulls /usr/bin/ruby
-# - monitor http://bugs.kde.org/show_bug.cgi?id=137390 to remove the temporary fix
-# - ProjectM (see README)
-# - karma & MFS (see README)
-# - ipod mount should not inherit descriptions (like fuse mount has /dev/alsa nodes open)
-#
-# Conditional builds:
-%bcond_without xine            # disable xine engine
-%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    nmm             # enable NMM audio backend
-%bcond_with    mysql           # enable MySQL support
-%bcond_with    pgsql           # enable PostgreSQL support
-#
-%ifarch i386
-%undefine      with_helix
-%endif
+# TODO
+# - try not to link with static mysql
+
+%define                state   stable
+%define                qtver   4.5.0
+%define                snap    941228

 
 Summary:       A KDE audio player
 Summary(pl.UTF-8):     Odtwarzacz audio dla KDE
 Name:          amarok
 
 Summary:       A KDE audio player
 Summary(pl.UTF-8):     Odtwarzacz audio dla KDE
 Name:          amarok

-Version:       1.4.10
-Release:       9
+Version:       2.1
+Release:       1

 License:       GPL
 Group:         X11/Applications/Multimedia
 License:       GPL
 Group:         X11/Applications/Multimedia

-Source0:       ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 3bdbf26181bf5e5925f48968caba7ac2
-Patch0:                %{name}-helixplayer-morearchs.patch
-Patch1:                %{name}-libnjb.patch
-Patch2:                %{name}-smp.patch
-Patch3:                %{name}-sparc.patch
-Patch4:                kde-ac260-lt.patch
-Patch5:                kde-common-PLD.patch
-Patch6:                %{name}-gcc4.patch
-Patch7:                %{name}-titleorder.patch
-Patch8:                %{name}-mongrel.patch
-Patch9:                %{name}-libmtp.patch
+Source0:       ftp://ftp.kde.org/pub/kde/%{state}/amarok/%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5: 76e5496a1bf2a8116210143f6479c1fb
+#Source0:      %{name}-%{version}-%{snap}.tar.bz2
+Patch0:                %{name}-link.patch
+Patch1:                %{name}-qthreadpool.patch

 URL:           http://amarok.kde.org/
 URL:           http://amarok.kde.org/

-# Upgrade to 2.0.1.1 required?
-# http://www.trapkit.de/advisories/TKADV2009-002.txt
-# http://amarok.kde.org/de/node/600
-#BuildRequires:        security(TKADV2009-002)
-BuildRequires: SDL-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: dbus-glib-devel
-BuildRequires: gettext-devel
-BuildRequires: kdebase-devel
-BuildRequires: kdemultimedia-devel >= 9:3.1.93
-%{?with_mp3players:BuildRequires:      libgpod-devel >= 0.6.0}
-%{?with_mp3players:BuildRequires:      libifp-devel >= 1.0.0.2}
-BuildRequires: libltdl-devel
-%{?with_mp3players:BuildRequires:      libmtp-devel >= 0.3.0}
-%{?with_mp3players:BuildRequires:      libnjb-devel >= 2.2.4}
-%{?with_pgsql:BuildRequires:           libpqxx-devel}
-BuildRequires: libtunepimp-devel >= 0.5.1-6
+BuildRequires: Qt3Support-devel >= %{qtver}
+BuildRequires: QtCore-devel >= %{qtver}
+BuildRequires: QtDBus-devel >= %{qtver}
+BuildRequires: QtDesigner-devel >= %{qtver}
+BuildRequires: QtNetwork-devel >= %{qtver}
+BuildRequires: QtOpenGL-devel >= %{qtver}
+BuildRequires: QtScript-devel >= %{qtver}
+BuildRequires: QtSql-devel >= %{qtver}
+BuildRequires: QtSvg-devel >= %{qtver}
+BuildRequires: QtTest-devel >= %{qtver}
+BuildRequires: QtUiTools-devel >= %{qtver}
+BuildRequires: QtWebKit-devel >= %{qtver}
+BuildRequires: QtXml-devel >= %{qtver}
+BuildRequires: automoc4
+BuildRequires: cmake >= 2.6.1-2
+BuildRequires: curl-devel
+BuildRequires: giflib-devel
+BuildRequires: glib2-devel
+BuildRequires: kde4-kdebase-devel
+BuildRequires: kde4-kdemultimedia-devel
+BuildRequires: libgpod-devel >= 0.7.0
+BuildRequires: libifp-devel >= 1.0.0.2
+BuildRequires: libmtp-devel >= 0.3.0
+BuildRequires: libnjb-devel >= 2.2.4

 BuildRequires: libvisual-devel >= 0.4.0
 BuildRequires: libvisual-devel >= 0.4.0

+BuildRequires: loudmouth-devel

 BuildRequires: mpeg4ip-devel >= 1:1.6
 BuildRequires: mpeg4ip-devel >= 1:1.6

-%{?with_mysql:BuildRequires:           mysql-devel}
+BuildRequires: mysql-devel >= 5.1.31-3

 BuildRequires: pcre-devel
 BuildRequires: pkgconfig
 BuildRequires: pcre-devel
 BuildRequires: pkgconfig

+BuildRequires: qt4-build >= %{qtver}
+BuildRequires: qt4-qmake >= %{qtver}
+BuildRequires: qtscriptbindings

 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.129
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.129

-BuildRequires: ruby-devel >= 1.8
-BuildRequires: sed >= 4.0
-%{!?with_included_sqlite:BuildRequires:        sqlite3-devel >= 3.3}
-BuildRequires: taglib-devel >= 1.4
-%{?with_xine:BuildRequires:    xine-lib-devel >= 1.1.1}
-Requires(post):        /sbin/ldconfig
-Requires:      %{name}-plugin = %{version}-%{release}
-Requires:      ruby-mongrel
-Suggests:      kdemultimedia(audiocd) >= 9:3.1.93
+BuildRequires: soprano-devel >= 2.1
+BuildRequires: strigi-devel >= 0.5.10
+BuildRequires: taglib-devel
+BuildRequires: taglib-extras-devel >= 0.1
+BuildRequires: utempter-devel
+BuildRequires: xorg-lib-libXpm-devel
+Requires(post,postun): /sbin/ldconfig
+Requires:      kde4-kdebase-core
+Requires:      kde4-kdemultimedia-audiocd
+Requires:      kde4-phonon
+Requires:      qtscriptbindings

 Suggests:      libvisual-plugin-actor-JESS
 Suggests:      libvisual-plugin-actor-bumpscope
 Suggests:      libvisual-plugin-actor-corona
 Suggests:      libvisual-plugin-actor-flower
 Suggests:      libvisual-plugin-actor-gdkpixbuf
 Suggests:      libvisual-plugin-actor-gforce
 Suggests:      libvisual-plugin-actor-JESS
 Suggests:      libvisual-plugin-actor-bumpscope
 Suggests:      libvisual-plugin-actor-corona
 Suggests:      libvisual-plugin-actor-flower
 Suggests:      libvisual-plugin-actor-gdkpixbuf
 Suggests:      libvisual-plugin-actor-gforce

+Suggests:      libvisual-plugin-actor-gstreamer

 Suggests:      libvisual-plugin-actor-infinite
 Suggests:      libvisual-plugin-actor-jakdaw
 Suggests:      libvisual-plugin-actor-lv_analyzer
 Suggests:      libvisual-plugin-actor-infinite
 Suggests:      libvisual-plugin-actor-jakdaw
 Suggests:      libvisual-plugin-actor-lv_analyzer


@@ -101,85 +87,27 @@ Suggests:  libvisual-plugin-morph-alphablend
 Suggests:      libvisual-plugin-morph-flash
 Suggests:      libvisual-plugin-morph-slide
 Suggests:      libvisual-plugin-morph-tentacle
 Suggests:      libvisual-plugin-morph-flash
 Suggests:      libvisual-plugin-morph-slide
 Suggests:      libvisual-plugin-morph-tentacle

-Suggests:      python-PyKDE

 Obsoletes:     amarok-arts
 Obsoletes:     amarok-xmms
 Obsoletes:     amarok-arts
 Obsoletes:     amarok-xmms

-Conflicts:     kdelibs-libs < 9:3.5.9
+# It should require mysql-embeded
+Requires:      mysql >= 5.1.31-3
+Conflicts:     mysql < 5.1.31-3

 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

-# temporary hack for proper libgpod::itdb_get_mountpoint() detection.
-%define                filterout_ld    -Wl,--as-needed
-

 %description
 A KDE audio player.
 
 %description -l pl.UTF-8
 Odtwarzacz audio dla KDE.
 
 %description
 A KDE audio player.
 
 %description -l pl.UTF-8
 Odtwarzacz audio dla KDE.
 

-%package -n konqueror-addon-amarok
-Summary:       Amarok sidebar for Konqueror
-Summary(pl.UTF-8):     Pasek z Amarokiem dla Konquerora
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{version}-%{release}
-
-%description -n konqueror-addon-amarok
-Amarok sidebar for Konqueror.
-
-%description -n konqueror-addon-amarok -l pl.UTF-8
-Pasek z Amarokiem dla Konquerora.
-
-%package helix
-Summary:       Helix/Realplayer playback support for amarok
-Summary(pl.UTF-8):     Wsparcie dla odtwarzania przez Helix/Realplayera dla amaroka
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{version}-%{release}
-Requires:      helix-core
-Provides:      %{name}-plugin = %{version}-%{release}
-
-%description helix
-Helix/Realplayer playback support for amarok.
-
-%description helix -l pl.UTF-8
-Wsparcie dla odtwarzania przez Helix/Realplayera dla amaroka.
-
-%package xine
-Summary:       Plugin xine
-Summary(pl.UTF-8):     Wtyczka xine
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{version}-%{release}
-Requires:      xine-plugin-audio
-Provides:      %{name}-plugin = %{version}-%{release}
-
-%description xine
-Plugin xine.
-
-%description xine -l pl.UTF-8
-Wtyczka xine.
-
-%package zeroconf
-Summary:       Zeroconf data
-Summary(pl.UTF-8):     Dane dla zeroconf
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{version}-%{release}
-Requires:      kdenetwork-kdnssd
-Provides:      %{name}-plugin = %{version}-%{release}
-
-%description zeroconf
-Zeroconf data.
-
-%description zeroconf -l pl.UTF-8
-Dane dla zeroconf.
-

 %package scripts
 Summary:       amaroK scripts
 Summary(pl.UTF-8):     Skrypty amaroKa
 Group:         X11/Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}
 %package scripts
 Summary:       amaroK scripts
 Summary(pl.UTF-8):     Skrypty amaroKa
 Group:         X11/Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}

-Requires:      /usr/bin/kdialog
-Requires:      python-PyQt
-Requires:      ruby-modules
+Requires:      kde4-kdebase-kdialog

 
 %description scripts
 amaroK scripts allow you extend amaroK functionality.
 
 %description scripts
 amaroK scripts allow you extend amaroK functionality.


@@ -195,252 +123,151 @@ Więcej o skryptach w amaroKu można dowiedzieć się stąd:
 
 %prep
 %setup -q
 
 %prep
 %setup -q

-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p0
-
-%{__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
-
-# kill env, call interpreter directly, so rpm automatics could rule
-%{__sed} -i -e '
-       1s,#!.*bin/env.*ruby,#!%{_bindir}/ruby,
-       1s,#!.*bin/env.*python,#!%{__python},
-' amarok/src/scripts/*/*.{py,rb} amarok/src/amarok_proxy.rb
+%patch0 -p0
+#%patch1 -p0

 
 %build
 
 %build

-cp -f /usr/share/automake/config.sub admin
-%{__make} -f admin/Makefile.common cvs
-
-# hack: passing something other than "no" or "yes" to --with-helix allows
-# us to pass HELIX_LIBS
-%configure \
-       HELIX_LIBS=%{_libdir}/helixplayer \
-       --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
-       --disable-rpath \
-       --with%{!?with_xine:out}-xine \
-       --with%{!?with_helix:out}-helix%{?with_helix:=usegivenpath} \
-       --with%{!?with_nmm:out}-nmm \
-       --with%{!?with_mp3players:out}-libgpod \
-       --with%{!?with_mp3players:out}-libnjb \
-       --with%{!?with_mp3players:out}-libmtp \
-       --with%{!?with_mp3players:out}-ifp \
-       --%{?with_mysql:en}%{!?with_mysql:dis}able-mysql \
-       --%{?with_mysql:en}%{!?with_mysql:dis}able-postgresql \
-       --disable-final \
-       --with-mp4v2 \
-       --with-qt-libraries=%{_libdir} \
-       --with%{!?with_included_sqlite:out}-included-sqlite
+install -d build
+cd build
+%cmake \
+       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+       -DLIB_INSTALL_DIR=%{_libdir} \
+       -DCMAKE_BUILD_TYPE=%{!?debug:release}%{?debug:debug} \
+%if "%{_lib}" == "lib64"
+       -DLIB_SUFFIX=64 \
+%endif
+       ../

 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 

-%{__make} install \
+%{__make} -C build install \

        DESTDIR=$RPM_BUILD_ROOT \
        DESTDIR=$RPM_BUILD_ROOT \

-       ruby_rubylibdir=%{ruby_rubylibdir} \

        kde_htmldir=%{_kdedocdir} \
        kde_libs_htmldir=%{_kdedocdir}
 
 # remove bogus dir
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/xx
 
        kde_htmldir=%{_kdedocdir} \
        kde_libs_htmldir=%{_kdedocdir}
 
 # remove bogus dir
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/xx
 

-rm $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/libamarok.{so,la}
-
-# example plugin code
-rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/amarok/scripts/templates
-
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
-       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
-%find_lang amarok --all-name --with-kde
+#%find_lang %{name} --with-kde

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%post -p /sbin/ldconfig
+%post          -p /sbin/ldconfig
+%postun                -p /sbin/ldconfig

 
 

-%postun        -p /sbin/ldconfig
-
-%files -f amarok.lang
+%files

 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/amarok
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/amarok

-%attr(755,root,root) %{_bindir}/amarokapp

 %attr(755,root,root) %{_bindir}/amarokcollectionscanner
 %attr(755,root,root) %{_bindir}/amarokcollectionscanner

-%attr(755,root,root) %{_bindir}/amarok_libvisual
-# used by last.fm and daap
-%attr(755,root,root) %{_bindir}/amarok_proxy.rb
-# used by daap
-%attr(755,root,root) %{_bindir}/amarok_daapserver.rb
-%attr(755,root,root) %{_libdir}/libamarok.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libamarok.so.0
-%attr(755,root,root) %{_libdir}/kde3/libamarok_generic-mediadevice.so
-%attr(755,root,root) %{_libdir}/kde3/libamarok_void-engine_plugin.so
-%attr(755,root,root) %{_libdir}/kde3/libamarok_daap-mediadevice.so
-%attr(755,root,root) %{_libdir}/kde3/libamarok_massstorage-device.so
-%attr(755,root,root) %{_libdir}/kde3/libamarok_nfs-device.so
-%attr(755,root,root) %{_libdir}/kde3/libamarok_smb-device.so
+%attr(755,root,root) %{_bindir}/amarokmp3tunesharmonydaemon
+%attr(755,root,root) %{_bindir}/amarok_afttagger
+%attr(755,root,root) %ghost %{_libdir}/libamaroklib.so.?
+%attr(755,root,root) %{_libdir}/libamaroklib.so.*.*.*
+#%attr(755,root,root) %ghost %{_libdir}/libamarok_taglib.so.?
+#%attr(755,root,root) %{_libdir}/libamarok_taglib.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libamarokpud.so.?
+%attr(755,root,root) %{_libdir}/libamarokpud.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmediadevicelib.so.?
+%attr(755,root,root) %{_libdir}/libmediadevicelib.so.*.*.*
+%attr(755,root,root) %{_libdir}/strigi/strigita_audible.so
+%attr(755,root,root) %{_libdir}/strigi/strigita_mp4.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_containment_vertical.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_bookmark.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_currenttrack.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_lyrics.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_serviceinfo.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_wikipedia.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_albums.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_service_opmldirectory.so
+%attr(755,root,root) %{_libdir}/kde4/libamarok_collection-ipodcollection.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_current.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_lyrics.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_service.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_wikipedia.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_service_ampache.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_service_jamendo.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_service_lastfm.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_service_magnatunestore.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_service_mp3tunes.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_service_shoutcast.so
+%attr(755,root,root) %{_libdir}/kde4/kcm_amarok_service_ampache.so
+%attr(755,root,root) %{_libdir}/kde4/kcm_amarok_service_lastfm.so
+%attr(755,root,root) %{_libdir}/kde4/kcm_amarok_service_magnatunestore.so
+%attr(755,root,root) %{_libdir}/kde4/kcm_amarok_service_mp3tunes.so
+%attr(755,root,root) %{_libdir}/kde4/libamarok_collection-daapcollection.so
+%attr(755,root,root) %{_libdir}/kde4/libamarok_collection-sqlcollection.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_mediadevices.so
+%attr(755,root,root) %{_libdir}/kde4/libamarok_collection-mtpcollection.so
+%attr(755,root,root) %{_libdir}/kde4/libamarok_massstorage-device.so
+%attr(755,root,root) %{_libdir}/libamarok_service_liblastfm.so

 %dir %{_datadir}/apps/amarok
 %dir %{_datadir}/apps/amarok/scripts
 %dir %{_datadir}/apps/amarok
 %dir %{_datadir}/apps/amarok/scripts

-%{_datadir}/apps/amarok/*.rc

 %{_datadir}/apps/amarok/data
 %{_datadir}/apps/amarok/icons
 %{_datadir}/apps/amarok/images
 %{_datadir}/apps/amarok/data
 %{_datadir}/apps/amarok/icons
 %{_datadir}/apps/amarok/images

-%{_datadir}/apps/amarok/themes
-%{_datadir}/apps/profiles/amarok.profile.xml
-%{_datadir}/config/amarokrc
-%{_datadir}/config.kcfg/amarok.kcfg
-%{_datadir}/services/amarok_generic-mediadevice.desktop
-%{_datadir}/services/amarok_void-engine_plugin.desktop
-%{_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
+%{_datadir}/apps/desktoptheme
+%{_datadir}/config.kcfg/amarokconfig.kcfg
+%{_datadir}/config/amarok.knsrc
+%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.player.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.root.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.tracklist.xml
+%{_datadir}/kde4/services/amarok.protocol
+%{_datadir}/kde4/services/amaroklastfm.protocol
+%{_datadir}/kde4/services/ServiceMenus/amarok_append.desktop
+%{_datadir}/kde4/services/amarok-containment-vertical.desktop
+%{_datadir}/kde4/services/amarok-context-applet-bookmark.desktop
+%{_datadir}/kde4/services/amarok-context-applet-currenttrack.desktop
+%{_datadir}/kde4/services/amarok-context-applet-lyrics.desktop
+%{_datadir}/kde4/services/amarok-context-applet-serviceinfo.desktop
+%{_datadir}/kde4/services/amarok-context-applet-wikipedia.desktop
+%{_datadir}/kde4/services/amarok-context-applet-mediadevices.desktop
+%{_datadir}/kde4/services/amarok_collection-mtpcollection.desktop
+%{_datadir}/kde4/services/amarok-data-engine-current.desktop
+%{_datadir}/kde4/services/amarok-data-engine-lyrics.desktop
+%{_datadir}/kde4/services/amarok-data-engine-service.desktop
+%{_datadir}/kde4/services/amarok-data-engine-wikipedia.desktop
+%{_datadir}/kde4/services/amarok_collection-daapcollection.desktop
+%{_datadir}/kde4/services/amarok_collection-sqlcollection.desktop
+%{_datadir}/kde4/services/amarok_service_ampache.desktop
+%{_datadir}/kde4/services/amarok_service_ampache_config.desktop
+%{_datadir}/kde4/services/amarok_service_jamendo.desktop
+%{_datadir}/kde4/services/amarok_service_lastfm.desktop
+%{_datadir}/kde4/services/amarok_service_lastfm_config.desktop
+%{_datadir}/kde4/services/amarok_service_magnatunestore.desktop
+%{_datadir}/kde4/services/amarok_service_magnatunestore_config.desktop
+%{_datadir}/kde4/services/amarok_service_mp3tunes.desktop
+%{_datadir}/kde4/services/amarok_service_mp3tunes_config.desktop
+%{_datadir}/kde4/services/amarok_service_shoutcast.desktop
+%{_datadir}/kde4/services/amarok-context-applet-albums.desktop
+%{_datadir}/kde4/services/amarok_collection-ipodcollection.desktop
+%{_datadir}/kde4/services/amarok_massstorage-device.desktop
+%{_datadir}/kde4/services/amarok_service_opmldirectory.desktop
+%{_datadir}/kde4/servicetypes/amarok_context_applet.desktop
+%{_datadir}/kde4/servicetypes/amarok_data_engine.desktop
+%{_datadir}/kde4/servicetypes/amarok_plugin.desktop
+%{_datadir}/kde4/servicetypes/amarok_codecinstall.desktop
+%{_desktopdir}/kde4/amarok.desktop

 %{_iconsdir}/*/*/apps/amarok.*
 %{_iconsdir}/*/*/apps/amarok.*

-
-# TODO: move to subpackage
-%dir %{ruby_rubylibdir}/amarok
-# used by daap
-%{ruby_rubylibdir}/amarok/codes.rb
-# used by daap and lyrics_lyrc
-%{ruby_rubylibdir}/amarok/debug.rb
-
-# TODO: move to subpackage
-%if %{with mp3players}
-%attr(755,root,root) %{_libdir}/kde3/libamarok_ifp-mediadevice.so
-%attr(755,root,root) %{_libdir}/kde3/libamarok_ipod-mediadevice.so
-%attr(755,root,root) %{_libdir}/kde3/libamarok_mtp-mediadevice.so
-%attr(755,root,root) %{_libdir}/kde3/libamarok_njb-mediadevice.so
-%{_datadir}/services/amarok_ifp-mediadevice.desktop
-%{_datadir}/services/amarok_ipod-mediadevice.desktop
-%{_datadir}/services/amarok_mtp-mediadevice.desktop
-%{_datadir}/services/amarok_njb-mediadevice.desktop
-%endif
-
-%files -n konqueror-addon-amarok
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/kde3/konqsidebar_universalamarok.so
-%{_datadir}/apps/konqueror/servicemenus/amarok_append.desktop
-%{_datadir}/apps/konqueror/servicemenus/amarok_addaspodcast.desktop
-%{_datadir}/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
-%{_datadir}/apps/konqsidebartng/add/amarok.desktop
-%{_datadir}/apps/konqsidebartng/entries/amarok.desktop
-%{_datadir}/apps/konqsidebartng/kicker_entries/amarok.desktop
-
-%if %{with helix}
-%files helix
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/kde3/libamarok_helixengine_plugin.so
-%{_datadir}/config.kcfg/helixconfig.kcfg
-%{_datadir}/services/amarok_helixengine_plugin.desktop
-%endif
-
-%if %{with xine}
-%files xine
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/kde3/libamarok_xine-engine.so
-%{_datadir}/config.kcfg/xinecfg.kcfg
-%{_datadir}/services/amarok_xine-engine.desktop
-%endif
-
-%if 0
-%if %{with zeroconf}
-%files zeroconf
-%defattr(644,root,root,755)
-#%{_datadir}/apps/zeroconf/_shoutcast._tcp
-%endif
-%endif
+%{_datadir}/config/amarok_homerc

 
 %files scripts
 %defattr(644,root,root,755)
 
 %files scripts
 %defattr(644,root,root,755)

-%dir %{_datadir}/apps/amarok/scripts/common
-%{_datadir}/apps/amarok/scripts/common/Publisher.py
-%{_datadir}/apps/amarok/scripts/common/Zeroconf.py
-
-# amarok searches for executable programs for scripts
-# to figure out which files need to have execute permission, use this
-# find command:
-# $ find $RPM_BUILD_ROOT/usr/share/apps/amarok/scripts -perm +1
-
-#%dir %{_datadir}/apps/amarok/scripts/graphequalizer
-#%{_datadir}/apps/amarok/scripts/graphequalizer/README
-#%attr(755,root,root) %{_datadir}/apps/amarok/scripts/graphequalizer/graphequalizer
-
-%dir %{_datadir}/apps/amarok/scripts/playlist2html
-%{_datadir}/apps/amarok/scripts/playlist2html/README
-%{_datadir}/apps/amarok/scripts/playlist2html/Playlist.py
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/playlist2html/PlaylistServer.py
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/playlist2html/playlist2html.py
-%{_datadir}/apps/amarok/scripts/playlist2html/PlaylistServer.spec
-%{_datadir}/apps/amarok/scripts/playlist2html/playlist2html.spec
-
-%dir %{_datadir}/apps/amarok/scripts/webcontrol
-%{_datadir}/apps/amarok/scripts/webcontrol/README
-%{_datadir}/apps/amarok/scripts/webcontrol/Globals.py
-%{_datadir}/apps/amarok/scripts/webcontrol/Playlist.py
-%{_datadir}/apps/amarok/scripts/webcontrol/RequestHandler.py
-%{_datadir}/apps/amarok/scripts/webcontrol/amarok_cut.png
-%{_datadir}/apps/amarok/scripts/webcontrol/controlbackground.png
-%{_datadir}/apps/amarok/scripts/webcontrol/main.css
-%{_datadir}/apps/amarok/scripts/webcontrol/main.js
-%{_datadir}/apps/amarok/scripts/webcontrol/player_end.png
-%{_datadir}/apps/amarok/scripts/webcontrol/player_pause.png
-%{_datadir}/apps/amarok/scripts/webcontrol/player_play.png
-%{_datadir}/apps/amarok/scripts/webcontrol/player_start.png
-%{_datadir}/apps/amarok/scripts/webcontrol/player_stop.png
-%{_datadir}/apps/amarok/scripts/webcontrol/template.thtml
-%{_datadir}/apps/amarok/scripts/webcontrol/vol_speaker.png
-%{_datadir}/apps/amarok/scripts/webcontrol/WebPublisher.py
-%{_datadir}/apps/amarok/scripts/webcontrol/WebControl.spec
-%{_datadir}/apps/amarok/scripts/webcontrol/smallstar.png
-%{_datadir}/apps/amarok/scripts/webcontrol/star.png
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/webcontrol/WebControl.py
-
-%dir %{_datadir}/apps/amarok/scripts/lyrics_astraweb
-%{_datadir}/apps/amarok/scripts/lyrics_astraweb/COPYING
-%{_datadir}/apps/amarok/scripts/lyrics_astraweb/README
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb
-%{_datadir}/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.spec
-
-%dir %{_datadir}/apps/amarok/scripts/lyrics_lyrc
-%{_datadir}/apps/amarok/scripts/lyrics_lyrc/COPYING
-%{_datadir}/apps/amarok/scripts/lyrics_lyrc/README
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.rb
-%{_datadir}/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.spec
-
-%dir %{_datadir}/apps/amarok/scripts/score_default
-%{_datadir}/apps/amarok/scripts/score_default/COPYING
-%{_datadir}/apps/amarok/scripts/score_default/README
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/score_default/score_default.rb
-%{_datadir}/apps/amarok/scripts/score_default/score_default.spec
-%dir %{_datadir}/apps/amarok/scripts/score_impulsive
-%{_datadir}/apps/amarok/scripts/score_impulsive/COPYING
-%{_datadir}/apps/amarok/scripts/score_impulsive/README
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/score_impulsive/score_impulsive.rb
-%{_datadir}/apps/amarok/scripts/score_impulsive/score_impulsive.spec
-
-%if 0
-%dir %{_datadir}/apps/amarok/scripts/amarok_live
-%{_datadir}/apps/amarok/scripts/amarok_live/README
-%{_datadir}/apps/amarok/scripts/amarok_live/amarok.live.remaster.part1.sh
-%{_datadir}/apps/amarok/scripts/amarok_live/amarok.live.remaster.part2.sh
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/amarok_live/amarok_live.py
-%endif
+%dir %{_datadir}/apps/amarok/scripts/radio_station_service
+%{_datadir}/apps/amarok/scripts/radio_station_service/main.js
+%{_datadir}/apps/amarok/scripts/radio_station_service/script.spec
+%dir %{_datadir}/apps/amarok/scripts/script_console
+%{_datadir}/apps/amarok/scripts/script_console/main.js
+%{_datadir}/apps/amarok/scripts/script_console/script.spec
+%dir %{_datadir}/apps/amarok/scripts/lyrics_lyricwiki
+%{_datadir}/apps/amarok/scripts/lyrics_lyricwiki/main.js
+%{_datadir}/apps/amarok/scripts/lyrics_lyricwiki/script.spec
+%dir %{_datadir}/apps/amarok/scripts/librivox_service
+%{_datadir}/apps/amarok/scripts/librivox_service/main.js
+%{_datadir}/apps/amarok/scripts/librivox_service/LibrivoxLogo.png
+%{_datadir}/apps/amarok/scripts/librivox_service/LibrivoxService.html
+%{_datadir}/apps/amarok/scripts/librivox_service/script.spec