packages: kadu/kadu.spec - adjusted filedesc modules - restored configurati...

[lisu]

Author: lisu                         Date: Mon Sep 12 19:34:37 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjusted filedesc modules
- restored configuration for encryption module

---- Files affected:
packages/kadu:
   kadu.spec (1.289 -> 1.290) 

---- Diffs:

================================================================
Index: packages/kadu/kadu.spec
diff -u packages/kadu/kadu.spec:1.289 packages/kadu/kadu.spec:1.290
--- packages/kadu/kadu.spec:1.289	Mon Sep 12 21:29:59 2011
+++ packages/kadu/kadu.spec	Mon Sep 12 21:34:32 2011
@@ -1294,11 +1294,7 @@
 %{__sed} -i 's/\tencryption_ng$/\t#encryption_ng/' Plugins.cmake
 %{__sed} -i 's/\tencryption_ng_simlite$/\t#encryption_ng_simlite/' Plugins.cmake
 %endif
-%if %{with filedesc}
-%{__sed} -i 's/module_filedesc=n/module_filedesc=m/' .config
-%else
-%{__sed} -i 's/module_filedesc=m/module_filedesc=n/' .config
-%endif
+%{!?with_filedesc:%{__sed} -i 's/\filedesc$/\t#filedesc/' Plugins.cmake}
 %if %{with filtering}
 %{__sed} -i 's/module_filtering=n/module_filtering=m/' .config
 %else
@@ -1882,6 +1878,7 @@
 %defattr(644,root,root,755)
 %{modules_data_dir}/encryption_ng.desc
 %{modules_data_dir}/encryption_ng_simlite.desc
+%{modules_data_dir}/configuration/encryption_ng.ui
 %attr(755,root,root) %{modules_lib_dir}/libencryption_ng.so
 %attr(755,root,root) %{modules_lib_dir}/libencryption_ng_simlite.so
 %lang(cs) %{modules_data_dir}/translations/encryption_ng_cs.qm
@@ -1914,21 +1911,18 @@
 %lang(pl) %{modules_data_dir}/translations/desktop_docking_pl.qm
 %endif
 
-%if 0
 %if %{with filedesc}
 %files module-filedesc
 %defattr(644,root,root,755)
 %{modules_data_dir}/filedesc.desc
 %{modules_data_dir}/configuration/filedesc.ui
 %attr(755,root,root) %{modules_lib_dir}/libfiledesc.so
+%lang(cs) %{modules_data_dir}/translations/filedesc_cs.qm
 %lang(de) %{modules_data_dir}/translations/filedesc_de.qm
-%lang(fr) %{modules_data_dir}/translations/filedesc_fr.qm
-%lang(it) %{modules_data_dir}/translations/filedesc_it.qm
 %lang(pl) %{modules_data_dir}/translations/filedesc_pl.qm
-#%dir %{modules_data_dir}/data/filedesc
-#%{modules_data_dir}/data/filedesc/*.png
 %endif
 
+%if 0
 %if %{with filtering}
 %files module-filtering
 %defattr(644,root,root,755)
@@ -2472,6 +2466,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.290  2011/09/12 19:34:32  lisu
+- adjusted filedesc modules
+- restored configuration for encryption module
+
 Revision 1.289  2011/09/12 19:29:59  lisu
 - fix encryption bcond
 
================================================================

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