SPECS (AC-branch): amarok.spec - use system mongrel - move ruby fi...

[glen]

Author: glen                         Date: Sun May  4 10:07:54 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use system mongrel
- move ruby files to ruby dirs

---- Files affected:
SPECS:
   amarok.spec (1.151.2.15 -> 1.151.2.16) 

---- Diffs:

================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.151.2.15 SPECS/amarok.spec:1.151.2.16
--- SPECS/amarok.spec:1.151.2.15	Sat May  3 18:07:24 2008
+++ SPECS/amarok.spec	Sun May  4 12:07:49 2008
@@ -43,6 +43,7 @@
 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
@@ -77,6 +78,7 @@
 Requires:	%{name}-plugin = %{version}-%{release}
 Requires:	kdebase-core >= 9:3.1.93
 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
@@ -227,6 +229,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \
 	amarok/src/amarok.desktop \
@@ -274,6 +277,7 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
+	ruby_rubylibdir=%{ruby_rubylibdir} \
 	kde_htmldir=%{_kdedocdir} \
 	kde_libs_htmldir=%{_kdedocdir}
 
@@ -282,7 +286,6 @@
 
 rm $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/libamarok.{so,la}
-rm $RPM_BUILD_ROOT%{_libdir}/ruby_lib/libhttp11.{so,la}
 
 %find_lang amarok --all-name --with-kde
 
@@ -300,7 +303,9 @@
 %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) %ghost %{_libdir}/libamarok.so.0
@@ -311,13 +316,8 @@
 %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.0.0.0
-%attr(755,root,root) %{_libdir}/ruby_lib/libhttp11.so.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
@@ -345,6 +345,14 @@
 %{_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
@@ -470,9 +478,6 @@
 %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
@@ -487,6 +492,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.151.2.16  2008-05-04 10:07:49  glen
+- use system mongrel
+- move ruby files to ruby dirs
+
 Revision 1.151.2.15  2008-05-03 16:07:24  glen
 - merged 1.4.9.1 from HEAD
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/amarok.spec?r1=1.151.2.15&r2=1.151.2.16&f=u