packages: kadu/kadu.spec - adjusted modules: mediaplayer_falf and mediaplay...

[lisu]

Author: lisu                         Date: Mon Sep 12 20:43:29 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjusted modules: mediaplayer_falf and mediaplayer_mpris

---- Files affected:
packages/kadu:
   kadu.spec (1.292 -> 1.293) 

---- Diffs:

================================================================
Index: packages/kadu/kadu.spec
diff -u packages/kadu/kadu.spec:1.292 packages/kadu/kadu.spec:1.293
--- packages/kadu/kadu.spec:1.292	Mon Sep 12 22:16:48 2011
+++ packages/kadu/kadu.spec	Mon Sep 12 22:43:24 2011
@@ -1346,16 +1346,8 @@
 %else
 %{__sed} -i 's/module_dragon_mediaplayer=m/module_dragon_mediaplayer=n/' .config
 %endif
-%if %{with mediaplayer_falf}
-%{__sed} -i 's/module_falf_mediaplayer=n/module_falf_mediaplayer=m/' .config
-%else
-%{__sed} -i 's/module_falf_mediaplayer=m/module_falf_mediaplayer=n/' .config
-%endif
-%if %{with mediaplayer_mpris}
-%{__sed} -i 's/module_mpris_mediaplayer=n/module_mpris_mediaplayer=m/' .config
-%else
-%{__sed} -i 's/module_mpris_mediaplayer=m/module_mpris_mediaplayer=n/' .config
-%endif
+%{!?with_mediaplayer_falf:%{__sed} -i 's/\tfalf_mediaplayer$/\t#falf_mediaplayer/' Plugins.cmake}
+%{!?with_mediaplayer_mpris:%{__sed} -i 's/\tmprisplayer_mediaplayer$/\t#mprisplayer_mediaplayer/' Plugins.cmake}
 %if %{with mediaplayer_vlc}
 %{__sed} -i 's/module_vlc_mediaplayer=n/module_vlc_mediaplayer=m/' .config
 %else
@@ -2001,8 +1993,8 @@
 %{modules_data_dir}/amarok1_mediaplayer.desc
 %attr(755,root,root) %{modules_lib_dir}/libamarok1_mediaplayer.so
 %endif
-%if 0
 
+%if 0
 %if %{with mediaplayer_amarok2}
 %files module-mediaplayer-amarok2
 %defattr(644,root,root,755)
@@ -2030,6 +2022,7 @@
 %{modules_data_dir}/dragon_mediaplayer.desc
 %attr(755,root,root) %{modules_lib_dir}/libdragon_mediaplayer.so
 %endif
+%endif
 
 %if %{with mediaplayer_falf}
 %files module-mediaplayer-falf
@@ -2041,12 +2034,14 @@
 %if %{with mediaplayer_mpris}
 %files module-mediaplayer-mpris
 %defattr(644,root,root,755)
-%{modules_data_dir}/mpris_mediaplayer.desc
-%{modules_data_dir}/configuration/mpris_mediaplayer.ui
-%attr(755,root,root) %{modules_lib_dir}/libmpris_mediaplayer.so
-%lang(pl) %{modules_data_dir}/translations/mpris_mediaplayer_pl.qm
+%{modules_data_dir}/mprisplayer_mediaplayer.desc
+%{modules_data_dir}/configuration/mprisplayer_mediaplayer.ui
+%attr(755,root,root) %{modules_lib_dir}/libmprisplayer_mediaplayer.so
+%lang(pl) %{modules_data_dir}/translations/mprisplayer_mediaplayer_pl.qm
+%{modules_data_dir}/data/mprisplayer_mediaplayer/mprisplayer-players.data
 %endif
 
+%if 0
 %if %{with mediaplayer_vlc}
 %files module-mediaplayer-vlc
 %defattr(644,root,root,755)
@@ -2456,6 +2451,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.293  2011/09/12 20:43:24  lisu
+- adjusted modules: mediaplayer_falf and mediaplayer_mpris
+
 Revision 1.292  2011/09/12 20:16:48  lisu
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kadu/kadu.spec?r1=1.292&r2=1.293&f=u