Author: glen Date: Mon May 5 14:49:49 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - use system mongrel; R: kdelibs with so loader; rel 3
---- Files affected: SPECS: amarok.spec (1.178 -> 1.179) ---- Diffs: ================================================================ Index: SPECS/amarok.spec diff -u SPECS/amarok.spec:1.178 SPECS/amarok.spec:1.179 --- SPECS/amarok.spec:1.178 Mon Apr 14 15:15:06 2008 +++ SPECS/amarok.spec Mon May 5 16:49:44 2008 @@ -7,8 +7,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) @@ -30,7 +30,7 @@ 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 @@ -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 @@ -76,7 +77,9 @@ 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 @@ -229,6 +232,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \ amarok/src/amarok.desktop \ @@ -276,6 +280,7 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ + ruby_rubylibdir=%{ruby_rubylibdir} \ kde_htmldir=%{_kdedocdir} \ kde_libs_htmldir=%{_kdedocdir} @@ -283,7 +288,7 @@ 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/[EMAIL PROTECTED] ] || \ mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin} @@ -303,10 +308,12 @@ %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 @@ -314,13 +321,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 -%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 @@ -348,6 +350,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 @@ -424,6 +434,9 @@ %{_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 @@ -470,9 +483,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 +497,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.179 2008-05-05 14:49:44 glen +- use system mongrel; R: kdelibs with so loader; rel 3 + Revision 1.178 2008-04-14 13:15:06 arekm - up to 1.4.9.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/amarok.spec?r1=1.178&r2=1.179&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
