1.1 --- a/squirrelmail/squirrelmail.spec Sat Jul 09 15:39:59 2011 +0200
1.2 +++ b/squirrelmail/squirrelmail.spec Sat Jul 09 16:54:58 2011 +0200
1.3 @@ -22,12 +22,12 @@
1.4 ##
1.5
1.6 # package version
1.7 -%define V_squirrelmail 1.4.17
1.8 -%define V_locale 1.4.13-20071220
1.9 +%define V_squirrelmail 1.4.21
1.10 +%define V_locale 1.4.18-20090526
1.11 %define V_plugin_compat 2.0.14-1.0
1.12 -%define V_plugin_logger 2.3-1.2.7
1.13 +%define V_plugin_logger 2.3.1-1.2.7
1.14 %define V_plugin_addgraphics 2.3-1.0.3
1.15 -%define V_plugin_avelsieve 1.9.4
1.16 +%define V_plugin_avelsieve 1.9.7
1.17 %define V_plugin_saslpwd 1.4.1-1.4
1.18 %define V_plugin_ldappwd 2.2-1.4.0
1.19 %define V_plugin_checkquota 2.2-1.4.0
1.20 @@ -37,11 +37,11 @@
1.21 %define V_plugin_update 0.7-1.4.2
1.22 %define V_plugin_userip 3.3-re-1.2.2
1.23 %define V_plugin_smallcal 0.8-1.2.3
1.24 -%define V_plugin_vkeyboard 0.9.1
1.25 +%define V_plugin_vkeyboard 0.9
1.26 %define V_plugin_username 2.3-1.0.0
1.27 %define V_plugin_loginnotes 1.2-1.4.0
1.28 %define V_plugin_passforget 2.2-1.0.1
1.29 -%define V_plugin_captcha 1.2-1.2.9
1.30 +%define V_plugin_captcha 1.2.3-1.2.9
1.31 %define V_plugin_smime 0.7-1.1.1
1.32 %define V_plugin_debug 1.2-1.4
1.33
1.34 @@ -56,7 +56,7 @@
1.35 Group: Mail
1.36 License: GPL
1.37 Version: %{V_squirrelmail}
1.38 -Release: 20110706
1.39 +Release: 20110708
1.40
1.41 # package options
1.42 %option with_plugins no
1.43 @@ -296,11 +296,6 @@
1.44 login_notes password_forget captcha smime debugger; do
1.45 mv $plug squirrelmail-%{V_squirrelmail}/plugins
1.46 done
1.47 -
1.48 - # provisionary untested recaptcha google buyout hack
1.49 - %{l_shtool} subst \
1.50 - -e 's;\(\$recaptcha_uri *=.*https://\)api-secure.recaptcha.net;\1www.google.com/recaptcha/api;' \
1.51 - plugins/captcha/backends/recaptcha/recaptcha.php
1.52 %endif
1.53
1.54 # clean up login screen of distractions
1.55 @@ -318,11 +313,9 @@
1.56 %{l_shtool} mkdir -f -p -m 755 doc/`dirname $fil`
1.57 mv -f $fil $_
1.58 done
1.59 - mv doc/plugins/squirrelspell/doc/README doc/plugins/squirrelspell
1.60 rm -rf doc/plugins/squirrelspell/doc doc/plugins/squirrelspell/index.php
1.61 mv plugins/squirrelspell/doc/* doc/plugins/squirrelspell
1.62 rm -rf plugins/squirrelspell/doc
1.63 - rm -f plugins/make_archive.pl
1.64 %if "%{with_plugins}" == "yes"
1.65 mv plugins/pupdate/docs/* doc/plugins/pupdate
1.66 rm -rf plugins/pupdate/docs
1.67 @@ -385,9 +378,8 @@
1.68 %if "%{with_plugins}" == "yes"
1.69 ( cd $RPM_BUILD_ROOT%{l_prefix}
1.70 %{l_patch} -p0 <%{PATCH squirrelmail.patch.plugins}
1.71 - rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/squirrelmail/*.orig
1.72 - rm -f $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/gpg/*.orig
1.73 - rm -f $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/chg_sasl_passwd/*.orig
1.74 + rm -f $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/functions/*.orig
1.75 + rm -f $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/src/*.orig
1.76 ) || exit $?
1.77 %endif
1.78
