- use system mongrel; R: kdelibs with so loader; rel 3

Changed files:
    amarok.spec -> 1.179

diff --git a/amarok.spec b/amarok.spec
index c1202ace78a16a87225873ee4596d6f9b3583f5b..44f9e8f64ee89e44ee1c3a45de0fcc6e9f0ca847 100644 (file)
--- a/amarok.spec
+++ b/amarok.spec
@@ -6,8 +6,8 @@
 # - 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
-# - karma & MFS (see README)
 # - ProjectM (see README)
+# - karma & MFS (see README)
 #
 # Conditional builds:
 %bcond_with    gstreamer       # enable gstreamer (gst10 not stable)
@@ -29,7 +29,7 @@ Summary:      A KDE audio player
 Summary(pl.UTF-8):     Odtwarzacz audio dla KDE
 Name:          amarok
 Version:       1.4.9.1
-Release:       1
+Release:       3
 License:       GPL
 Group:         X11/Applications/Multimedia
 Source0:       ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.tar.bz2
@@ -42,6 +42,7 @@ Patch4:               kde-ac260-lt.patch
 Patch5:                kde-common-PLD.patch
 Patch6:                %{name}-gcc4.patch
 Patch7:                %{name}-titleorder.patch
+Patch8:                %{name}-mongrel.patch
 URL:           http://amarok.kde.org/
 BuildRequires: SDL-devel
 BuildRequires: alsa-lib-devel
@@ -75,7 +76,9 @@ BuildRequires:        taglib-devel >= 1.4
 Requires(post):        /sbin/ldconfig
 Requires:      %{name}-plugin = %{version}-%{release}
 Requires:      kdebase-core >= 9:3.1.93
+Requires:      kdelibs-libs >= 9:3.5.9
 Requires:      kdemultimedia-audiocd >= 9:3.1.93
+Requires:      ruby-mongrel
 Suggests:      libvisual-plugin-actor-JESS
 Suggests:      libvisual-plugin-actor-bumpscope
 Suggests:      libvisual-plugin-actor-corona
@@ -228,6 +231,7 @@ Więcej o skryptach w amaroKu można dowiedzieć się stąd:
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \
        amarok/src/amarok.desktop \
@@ -275,6 +279,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
+       ruby_rubylibdir=%{ruby_rubylibdir} \
        kde_htmldir=%{_kdedocdir} \
        kde_libs_htmldir=%{_kdedocdir}
 
@@ -282,7 +287,7 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/xx
 
 rm $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/ruby_lib/libhttp11.la
+rm $RPM_BUILD_ROOT%{_libdir}/libamarok.{so,la}
 
 [ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
        mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
@@ -302,10 +307,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/amarokapp
 %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) %{_libdir}/libamarok.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libamarok.so.0
 %attr(755,root,root) %{_libdir}/kde3/konqsidebar_universalamarok.so
 %attr(755,root,root) %{_libdir}/kde3/libamarok_generic-mediadevice.so
 %attr(755,root,root) %{_libdir}/kde3/libamarok_void-engine_plugin.so
@@ -313,13 +320,8 @@ rm -rf $RPM_BUILD_ROOT
 %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
-%dir %{_libdir}/ruby_lib
-%{_libdir}/ruby_lib/http11.rb
-%attr(755,root,root) %{_libdir}/ruby_lib/libhttp11.so
-%attr(755,root,root) %{_libdir}/ruby_lib/libhttp11.so.0.0.0
 %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
@@ -347,6 +349,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/servicetypes/amarok_plugin.desktop
 %{_desktopdir}/kde/amarok.desktop
 %{_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
@@ -423,6 +433,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
@@ -469,9 +482,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_datadir}/apps/amarok/scripts/score_impulsive/score_impulsive.rb
 %{_datadir}/apps/amarok/scripts/score_impulsive/score_impulsive.spec
 
-%dir %{_datadir}/apps/amarok/scripts/ruby_debug
-%{_datadir}/apps/amarok/scripts/ruby_debug/debug.rb
-
 %if 0
 %dir %{_datadir}/apps/amarok/scripts/amarok_live
 %{_datadir}/apps/amarok/scripts/amarok_live/README