Author: lisu Date: Wed Dec 22 14:21:50 2010 GMT Module: packages Tag: DEVEL ---- Log message: - updated to 2.4 Beta 1 "Closer" - package more files - no strigi in this version - use rm macro and drop obsoleted one
---- Files affected: packages/amarok: amarok.spec (1.232 -> 1.232.2.1) ---- Diffs: ================================================================ Index: packages/amarok/amarok.spec diff -u packages/amarok/amarok.spec:1.232 packages/amarok/amarok.spec:1.232.2.1 --- packages/amarok/amarok.spec:1.232 Thu Nov 4 10:53:09 2010 +++ packages/amarok/amarok.spec Wed Dec 22 15:21:44 2010 @@ -1,20 +1,21 @@ # $Revision$, $Date$ # TODO -# - try not to link with static mysql +# - try not to link with static mysql +# - libampache_account_login.so is missing -%define state stable +%define state unstable %define qtver 4.7.0 %define kdever 4.5.0 Summary: A KDE audio player Summary(pl.UTF-8): Odtwarzacz audio dla KDE Name: amarok -Version: 2.3.2 -Release: 2 -License: GPL +Version: 2.3.90 +Release: 1 +License: GPL v2+ and LGPL v2.1+ Group: X11/Applications/Multimedia Source0: ftp://ftp.kde.org/pub/kde/%{state}/amarok/%{version}/src/%{name}-%{version}.tar.bz2 -# Source0-md5: 4e03dc009f8b44d9b8dfb5f6d1034081 +# Source0-md5: 6dc00a1291a45996458452251fb5fd0e Patch0: %{name}-disable_qtscriptbindings_check_fix.patch URL: http://amarok.kde.org/ BuildRequires: QtNetwork-devel >= %{qtver} @@ -124,14 +125,11 @@ kde_htmldir=%{_kdedocdir} \ kde_libs_htmldir=%{_kdedocdir} -# remove bogus dir -rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/xx - # remove unsupported locale -rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/s...@ijekavian* +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/s...@ijekavian* # remove .so symlinks so that noone gets the stupid idea to package them -rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.so +%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.so %find_lang %{name} --all-name --with-kde @@ -151,16 +149,21 @@ %attr(755,root,root) %{_bindir}/amarok_afttagger %attr(755,root,root) %ghost %{_libdir}/libamarok-sqlcollection.so.? %attr(755,root,root) %{_libdir}/libamarok-sqlcollection.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libamarok-transcoding.so.? +%attr(755,root,root) %{_libdir}/libamarok-transcoding.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libamarokcore.so.? +%attr(755,root,root) %{_libdir}/libamarokcore.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libamarokocsclient.so.? %attr(755,root,root) %{_libdir}/libamarokocsclient.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libamaroklib.so.? %attr(755,root,root) %{_libdir}/libamaroklib.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libamarokpud.so.? %attr(755,root,root) %{_libdir}/libamarokpud.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libamarokcore.so.? -%attr(755,root,root) %{_libdir}/libamarokcore.so.*.*.* -%attr(755,root,root) %{_libdir}/strigi/strigita_audible.so -%attr(755,root,root) %{_libdir}/strigi/strigita_mp4.so +%attr(755,root,root) %ghost %{_libdir}/libamarokqtjson.so.? +%attr(755,root,root) %{_libdir}/libamarokqtjson.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_context_applet_tabs.so %attr(755,root,root) %{_libdir}/kde4/amarok_appletscript_simple_javascript.so %attr(755,root,root) %{_libdir}/kde4/amarok_collection-audiocdcollection.so %attr(755,root,root) %{_libdir}/kde4/amarok_collection-daapcollection.so @@ -186,10 +189,12 @@ %attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_lyrics.so %attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_photos.so %attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_similarArtists.so +%attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_tabs.so %attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_upcomingEvents.so %attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_videoclip.so %attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_wikipedia.so %attr(755,root,root) %{_libdir}/kde4/amarok_massstorage-device.so +%attr(755,root,root) %{_libdir}/kde4/amarok_collection-playdarcollection.so %attr(755,root,root) %{_libdir}/kde4/amarok_runnerscript_javascript.so %attr(755,root,root) %{_libdir}/kde4/amarok_service_ampache.so %attr(755,root,root) %{_libdir}/kde4/amarok_service_jamendo.so @@ -201,6 +206,7 @@ %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 +%{_libdir}/kde4/amarok_collection-upnpcollection.so %dir %{_datadir}/apps/amarok %dir %{_datadir}/apps/amarok/scripts %{_datadir}/apps/amarok/data @@ -212,11 +218,13 @@ %{_datadir}/config.kcfg/amarokconfig.kcfg %{_datadir}/config/amarok.knsrc %{_datadir}/config/amarokapplets.knsrc +%{_datadir}/dbus-1/interfaces/org.kde.amarok.App.xml %{_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}/dbus-1/interfaces/org.kde.amarok.Mpris1Extensions.Player.xml +%{_datadir}/dbus-1/interfaces/org.kde.amarok.Mpris2Extensions.Player.xml %{_datadir}/dbus-1/interfaces/org.kde.amarok.Collection.xml -%{_datadir}/dbus-1/interfaces/org.kde.amarok.SqlCollection.xml %{_datadir}/kde4/services/amarok.protocol %{_datadir}/kde4/services/amaroklastfm.protocol %{_datadir}/kde4/services/amarokitpc.protocol @@ -227,6 +235,8 @@ %{_datadir}/kde4/services/amarok_collection-mtpcollection.desktop %{_datadir}/kde4/services/amarok_collection-mysqlecollection.desktop %{_datadir}/kde4/services/amarok_collection-mysqlservercollection.desktop +%{_datadir}/kde4/services/amarok_collection-playdarcollection.desktop +%{_datadir}/kde4/services/amarok_collection-upnpcollection.desktop %{_datadir}/kde4/services/amarok_collection-umscollection.desktop %{_datadir}/kde4/services/amarok-containment-vertical.desktop %{_datadir}/kde4/services/amarok-context-applet-albums.desktop @@ -236,6 +246,7 @@ %{_datadir}/kde4/services/amarok-context-applet-lyrics.desktop %{_datadir}/kde4/services/amarok-context-applet-photos.desktop %{_datadir}/kde4/services/amarok-context-applet-similarArtists.desktop +%{_datadir}/kde4/services/amarok-context-applet-tabs.desktop %{_datadir}/kde4/services/amarok-context-applet-upcomingEvents.desktop %{_datadir}/kde4/services/amarok-context-applet-videoclip.desktop %{_datadir}/kde4/services/amarok-context-applet-wikipedia.desktop @@ -245,6 +256,7 @@ %{_datadir}/kde4/services/amarok-data-engine-lyrics.desktop %{_datadir}/kde4/services/amarok-data-engine-photos.desktop %{_datadir}/kde4/services/amarok-data-engine-similarArtists.desktop +%{_datadir}/kde4/services/amarok-data-engine-tabs.desktop %{_datadir}/kde4/services/amarok-data-engine-upcomingEvents.desktop %{_datadir}/kde4/services/amarok-data-engine-videoclip.desktop %{_datadir}/kde4/services/amarok-data-engine-wikipedia.desktop @@ -296,6 +308,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.232.2.1 2010/12/22 14:21:44 lisu +- updated to 2.4 Beta 1 "Closer" +- package more files +- no strigi in this version +- use rm macro and drop obsoleted one + Revision 1.232 2010/11/04 09:53:09 shadzik - rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/amarok/amarok.spec?r1=1.232&r2=1.232.2.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
