SPECS (DEVEL): amarok.spec - revert (those files conflict)

[zergin]

Author: zergin                       Date: Sat Nov  8 03:39:31 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- revert (those files conflict)

---- Files affected:
SPECS:
   amarok.spec (1.123.2.38 -> 1.123.2.39) 

---- Diffs:

================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.123.2.38 SPECS/amarok.spec:1.123.2.39
--- SPECS/amarok.spec:1.123.2.38	Sat Nov  8 02:40:45 2008
+++ SPECS/amarok.spec	Sat Nov  8 04:39:26 2008
@@ -191,7 +191,6 @@
 %attr(755,root,root) %{_libdir}/kde4/libamarok_collection-sqlcollection.so
 %attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_mediadevices.so
 %attr(755,root,root) %{_libdir}/kde4/libamarok_collection-mtpcollection.so
-%attr(755,root,root) %{_libdir}/kde4/plasma_animator_default.so
 %attr(755,root,root) %{_libdir}/libamarok_taglib.so
 %attr(755,root,root) %{_libdir}/libamaroklib.so
 %attr(755,root,root) %{_libdir}/libamarokplasma.so
@@ -239,12 +238,10 @@
 %{_datadir}/kde4/services/amarok-data-engine-cloud.desktop
 %{_datadir}/kde4/services/amarok_collection-ipodcollection.desktop
 %{_datadir}/kde4/services/amarok_service_opmldirectory.desktop
-%{_datadir}/kde4/services/plasma-animator-default.desktop
 %{_datadir}/kde4/servicetypes/amarok_context_applet.desktop
 %{_datadir}/kde4/servicetypes/amarok_data_engine.desktop
 %{_datadir}/kde4/servicetypes/amarok_plugin.desktop
 %{_datadir}/kde4/servicetypes/amarok_codecinstall.desktop
-%{_datadir}/kde4/servicetypes/plasma-*.desktop
 %{_desktopdir}/kde4/amarok.desktop
 %{_iconsdir}/*/*/apps/amarok.*
 
@@ -277,6 +274,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.123.2.39  2008/11/08 03:39:26  zergin
+- revert (those files conflict)
+
 Revision 1.123.2.38  2008/11/08 01:40:45  zergin
 - package plasama files
 
================================================================

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