diff -r 3a96478f1303 -r cff8cdb0b6c4 squirrelmail/squirrelmail.spec
--- a/squirrelmail/squirrelmail.spec	Sat Apr 18 14:16:14 2009 +0200
+++ b/squirrelmail/squirrelmail.spec	Sat Apr 18 14:16:26 2009 +0200
@@ -418,19 +418,24 @@
             password_forget/config_example.php \
             password_forget/config.php
         %{l_shtool} install -c -m 644 \
-            -e 's;^//\( *\'CAPTCHA\'\);\1;g' \
-            -e 's;\(\$sl_logfile *=\);\1 \'%{l_prefix}/var/squirrelmail/log/squirrelmail.log\';' \
+            -e 's;^//\( *.CAPTCHA.,\);\1;g' \
+            -e 's,\(\$sl_dateformat *=\).*\(.\);$,\1 \2d.m.Y H:i:s\2;,g' \
+            -e 's,\(\$sl_logfile *=\).*\(.\);$,\1 \2%{l_prefix}/var/squirrelmail/log/squirrelmail.log\2;,g' \
             squirrel_logger/config_example.php \
             squirrel_logger/config.php
         %{l_shtool} install -c -m 644 \
-            -e 's;\(\$log_CAPTCHA_events =\).*;\1 1;' \
-            -e 's;\(\$captcha_backend =\).*;\1 \'recaptcha\';' \
+            -e 's/\(\$log_CAPTCHA_events *=\).*/\1 1;/' \
+            -e 's,\(\$captcha_backend *=\).*\(.\);$,\1 \2recaptcha\2;,' \
             captcha/config_example.php \
             captcha/config.php
-        %{l_shtool} install -c -m 644 \
-            -e 's;\(\$captcha_backend =\).*;\1 \'recaptcha\';' \
-            captcha/backends/recaptcha/recaptcha_config_example.php \
-            captcha/backends/recaptcha/recaptcha_config.php
+        for captname in \
+            b2evo captcha_php csi freecap hec hn_captcha opencaptcha \
+            phpcaptcha quickcaptcha quickform recaptcha textcaptcha
+            do
+                mv \
+                   captcha/backends/${captname}/${captname}_config_example.php \
+                   captcha/backends/${captname}/${captname}_config.php
+        done
         %{l_shtool} install -c -m 644 \
             smime/config_example.php \
             smime/config.php
@@ -513,7 +518,6 @@
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/etc/squirrelmail/*' \
-
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/prefs/*' \
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/squirrelspell/sqspell_config.php' \
 %if "%{with_plugins}" == "yes"
@@ -527,6 +531,7 @@
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/ldifimport/config.php' \
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/pupdate/config.php' \
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/show_user_and_ip/config.php' \
+        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/squirrel_logger/config.php' \
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/vkeyboard/config.php' \
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/username/config.php' \
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/login_notes/config.php' \
@@ -538,16 +543,12 @@
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/freecap/freecap_config.php' \
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/hec/hec_config.php' \
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/hn_captcha/hn_captcha_config.php' \
-        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/index.php/index.php_config.php' \
-        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/meezerk/meezerk_config.php' \
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/opencaptcha/opencaptcha_config.php' \
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/phpcaptcha/phpcaptcha_config.php' \
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/quickcaptcha/quickcaptcha_config.php' \
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/quickform/quickform_config.php' \
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/recaptcha/recaptcha_config.php' \
-        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/textcapnum/textcapnum_config.php' \
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/textcaptcha/textcaptcha_config.php' \
-        '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/watercap/watercap_config.php' \
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/smime/config.php' \
         '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/debugger/setup.php' \
 %endif