Author: glen Date: Sat May 3 16:07:29 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- merged 1.4.9.1 from HEAD
---- Files affected:
SPECS:
amarok.spec (1.151.2.14 -> 1.151.2.15)
---- Diffs:
================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.151.2.14 SPECS/amarok.spec:1.151.2.15
--- SPECS/amarok.spec:1.151.2.14 Mon Feb 25 00:15:17 2008
+++ SPECS/amarok.spec Sat May 3 18:07:24 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)
@@ -29,12 +29,12 @@
Summary: A KDE audio player
Summary(pl.UTF-8): Odtwarzacz audio dla KDE
Name: amarok
-Version: 1.4.8
-Release: 2
+Version: 1.4.9.1
+Release: 1
License: GPL
Group: X11/Applications/Multimedia
Source0: ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 7f65c4a8f3f0ff9042a5b5dd21b36cc8
+# Source0-md5: aa588778379a391ad3f4b3fc770217e4
Patch0: %{name}-helixplayer-morearchs.patch
Patch1: %{name}-libnjb.patch
Patch2: %{name}-smp.patch
@@ -77,6 +77,29 @@
Requires: %{name}-plugin = %{version}-%{release}
Requires: kdebase-core >= 9:3.1.93
Requires: kdemultimedia-audiocd >= 9:3.1.93
+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-lv_gltest
+Suggests: libvisual-plugin-actor-lv_scope
+Suggests: libvisual-plugin-actor-madspin
+Suggests: libvisual-plugin-actor-nastyfft
+Suggests: libvisual-plugin-actor-oinksie
+Suggests: libvisual-plugin-input-alsa
+Suggests: libvisual-plugin-input-esd
+Suggests: libvisual-plugin-input-jack
+Suggests: libvisual-plugin-input-mplayer
+Suggests: libvisual-plugin-morph-alphablend
+Suggests: libvisual-plugin-morph-flash
+Suggests: libvisual-plugin-morph-slide
+Suggests: libvisual-plugin-morph-tentacle
Obsoletes: amarok-arts
Obsoletes: amarok-xmms
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -257,19 +280,16 @@
# remove bogus dir
rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/xx
-rm $RPM_BUILD_ROOT%{_libdir}/ruby_lib/libhttp11.la
+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
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-/sbin/ldconfig
-if [ "$1" = 1 ]; then
- echo "Remember to install libvisual-plugins-* packages if you"
- echo "want to have a visualizations in amaroK."
-fi
+%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -282,26 +302,19 @@
%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
%attr(755,root,root) %{_libdir}/libamarok.so.*.*.*
-%{_libdir}/libamarok.la
+%attr(755,root,root) %ghost %{_libdir}/libamarok.so.0
%attr(755,root,root) %{_libdir}/kde3/konqsidebar_universalamarok.so
-%{_libdir}/kde3/konqsidebar_universalamarok.la
%attr(755,root,root) %{_libdir}/kde3/libamarok_generic-mediadevice.so
-%{_libdir}/kde3/libamarok_generic-mediadevice.la
%attr(755,root,root) %{_libdir}/kde3/libamarok_void-engine_plugin.so
-%{_libdir}/kde3/libamarok_void-engine_plugin.la
%attr(755,root,root) %{_libdir}/kde3/libamarok_daap-mediadevice.so
-%{_libdir}/kde3/libamarok_daap-mediadevice.la
%attr(755,root,root) %{_libdir}/kde3/libamarok_massstorage-device.so
-%{_libdir}/kde3/libamarok_massstorage-device.la
%attr(755,root,root) %{_libdir}/kde3/libamarok_nfs-device.so
-%{_libdir}/kde3/libamarok_nfs-device.la
%attr(755,root,root) %{_libdir}/kde3/libamarok_smb-device.so
-%{_libdir}/kde3/libamarok_smb-device.la
+%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
+%attr(755,root,root) %{_libdir}/ruby_lib/libhttp11.so.0
%dir %{_datadir}/apps/amarok
%dir %{_datadir}/apps/amarok/scripts
%{_datadir}/apps/amarok/ruby_lib
@@ -335,13 +348,9 @@
# TODO: move to subpackage
%if %{with mp3players}
%attr(755,root,root) %{_libdir}/kde3/libamarok_ifp-mediadevice.so
-%{_libdir}/kde3/libamarok_ifp-mediadevice.la
%attr(755,root,root) %{_libdir}/kde3/libamarok_ipod-mediadevice.so
-%{_libdir}/kde3/libamarok_ipod-mediadevice.la
%attr(755,root,root) %{_libdir}/kde3/libamarok_mtp-mediadevice.so
-%{_libdir}/kde3/libamarok_mtp-mediadevice.la
%attr(755,root,root) %{_libdir}/kde3/libamarok_njb-mediadevice.so
-%{_libdir}/kde3/libamarok_njb-mediadevice.la
%{_datadir}/services/amarok_ifp-mediadevice.desktop
%{_datadir}/services/amarok_ipod-mediadevice.desktop
%{_datadir}/services/amarok_mtp-mediadevice.desktop
@@ -367,7 +376,6 @@
%files helix
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/kde3/libamarok_helixengine_plugin.so
-%{_libdir}/kde3/libamarok_helixengine_plugin.la
%{_datadir}/config.kcfg/helixconfig.kcfg
%{_datadir}/services/amarok_helixengine_plugin.desktop
%endif
@@ -376,7 +384,6 @@
%files xine
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/kde3/libamarok_xine-engine.so
-%{_libdir}/kde3/libamarok_xine-engine.la
%{_datadir}/config.kcfg/xinecfg.kcfg
%{_datadir}/services/amarok_xine-engine.desktop
%endif
@@ -405,13 +412,18 @@
# 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
-%{_datadir}/apps/amarok/scripts/playlist2html/PlaylistServer.spec
-%{_datadir}/apps/amarok/scripts/playlist2html/playlist2html.spec
%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
@@ -475,6 +487,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.151.2.15 2008-05-03 16:07:24 glen
+- merged 1.4.9.1 from HEAD
+
Revision 1.151.2.14 2008-02-24 23:15:17 glen
- release 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/amarok.spec?r1=1.151.2.14&r2=1.151.2.15&f=u