diff -r 879299505589 -r aa138c6f5dd6 squirrelmail/squirrelmail.spec
--- a/squirrelmail/squirrelmail.spec	Sat Jul 09 15:39:59 2011 +0200
+++ b/squirrelmail/squirrelmail.spec	Sat Jul 09 16:54:58 2011 +0200
@@ -22,12 +22,12 @@
 ##
 
 #   package version
-%define       V_squirrelmail        1.4.17
-%define       V_locale              1.4.13-20071220
+%define       V_squirrelmail        1.4.21
+%define       V_locale              1.4.18-20090526
 %define       V_plugin_compat       2.0.14-1.0
-%define       V_plugin_logger       2.3-1.2.7
+%define       V_plugin_logger       2.3.1-1.2.7
 %define       V_plugin_addgraphics  2.3-1.0.3
-%define       V_plugin_avelsieve    1.9.4
+%define       V_plugin_avelsieve    1.9.7
 %define       V_plugin_saslpwd      1.4.1-1.4
 %define       V_plugin_ldappwd      2.2-1.4.0
 %define       V_plugin_checkquota   2.2-1.4.0
@@ -37,11 +37,11 @@
 %define       V_plugin_update       0.7-1.4.2
 %define       V_plugin_userip       3.3-re-1.2.2
 %define       V_plugin_smallcal     0.8-1.2.3
-%define       V_plugin_vkeyboard    0.9.1
+%define       V_plugin_vkeyboard    0.9
 %define       V_plugin_username     2.3-1.0.0
 %define       V_plugin_loginnotes   1.2-1.4.0
 %define       V_plugin_passforget   2.2-1.0.1
-%define       V_plugin_captcha      1.2-1.2.9
+%define       V_plugin_captcha      1.2.3-1.2.9
 %define       V_plugin_smime        0.7-1.1.1
 %define       V_plugin_debug        1.2-1.4
 
@@ -56,7 +56,7 @@
 Group:        Mail
 License:      GPL
 Version:      %{V_squirrelmail}
-Release:      20110706
+Release:      20110708
 
 #   package options
 %option       with_plugins  no
@@ -296,11 +296,6 @@
                 login_notes password_forget captcha smime debugger; do
         mv $plug squirrelmail-%{V_squirrelmail}/plugins
     done
-
-    #   provisionary untested recaptcha google buyout hack
-    %{l_shtool} subst \
-        -e 's;\(\$recaptcha_uri *=.*https://\)api-secure.recaptcha.net;\1www.google.com/recaptcha/api;' \
-        plugins/captcha/backends/recaptcha/recaptcha.php
 %endif
 
     #   clean up login screen of distractions
@@ -318,11 +313,9 @@
           %{l_shtool} mkdir -f -p -m 755 doc/`dirname $fil`
           mv -f $fil $_
       done
-      mv doc/plugins/squirrelspell/doc/README doc/plugins/squirrelspell
       rm -rf doc/plugins/squirrelspell/doc doc/plugins/squirrelspell/index.php
       mv plugins/squirrelspell/doc/* doc/plugins/squirrelspell
       rm -rf plugins/squirrelspell/doc
-      rm -f plugins/make_archive.pl
 %if "%{with_plugins}" == "yes"
       mv plugins/pupdate/docs/* doc/plugins/pupdate
       rm -rf plugins/pupdate/docs
@@ -385,9 +378,8 @@
 %if "%{with_plugins}" == "yes"
       ( cd $RPM_BUILD_ROOT%{l_prefix}
         %{l_patch} -p0 <%{PATCH squirrelmail.patch.plugins}
-        rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/squirrelmail/*.orig
-        rm -f $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/gpg/*.orig
-        rm -f $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/chg_sasl_passwd/*.orig
+        rm -f $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/functions/*.orig
+        rm -f $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/src/*.orig
       ) || exit $?
 %endif