changeset
Correct substitutions and missing constructs throughout packaging.
Sat, 18 Apr 2009 14:16:26 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 18 Apr 2009 14:16:26 +0200
- changeset 165
- cff8cdb0b6c4
- parent 164
- 3a96478f1303
- child 166
- 5802a00cd337
Correct substitutions and missing constructs throughout packaging.
Correct shtool(1) substitutions throughout, mostly embedded single
quotes and matching commas or semicolons. Install config files of
the form <plugin-name>_config.php for all unhandled plugins. Correct
superflous empty line in RPM files processing. Include squirrel_logger
config.php in config file attribute list. Remove unconfigurable captcha
backends from config file attribute list.
| squirrelmail/squirrelmail.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/squirrelmail/squirrelmail.spec Sat Apr 18 14:16:14 2009 +0200 1.2 +++ b/squirrelmail/squirrelmail.spec Sat Apr 18 14:16:26 2009 +0200 1.3 @@ -418,19 +418,24 @@ 1.4 password_forget/config_example.php \ 1.5 password_forget/config.php 1.6 %{l_shtool} install -c -m 644 \ 1.7 - -e 's;^//\( *\'CAPTCHA\'\);\1;g' \ 1.8 - -e 's;\(\$sl_logfile *=\);\1 \'%{l_prefix}/var/squirrelmail/log/squirrelmail.log\';' \ 1.9 + -e 's;^//\( *.CAPTCHA.,\);\1;g' \ 1.10 + -e 's,\(\$sl_dateformat *=\).*\(.\);$,\1 \2d.m.Y H:i:s\2;,g' \ 1.11 + -e 's,\(\$sl_logfile *=\).*\(.\);$,\1 \2%{l_prefix}/var/squirrelmail/log/squirrelmail.log\2;,g' \ 1.12 squirrel_logger/config_example.php \ 1.13 squirrel_logger/config.php 1.14 %{l_shtool} install -c -m 644 \ 1.15 - -e 's;\(\$log_CAPTCHA_events =\).*;\1 1;' \ 1.16 - -e 's;\(\$captcha_backend =\).*;\1 \'recaptcha\';' \ 1.17 + -e 's/\(\$log_CAPTCHA_events *=\).*/\1 1;/' \ 1.18 + -e 's,\(\$captcha_backend *=\).*\(.\);$,\1 \2recaptcha\2;,' \ 1.19 captcha/config_example.php \ 1.20 captcha/config.php 1.21 - %{l_shtool} install -c -m 644 \ 1.22 - -e 's;\(\$captcha_backend =\).*;\1 \'recaptcha\';' \ 1.23 - captcha/backends/recaptcha/recaptcha_config_example.php \ 1.24 - captcha/backends/recaptcha/recaptcha_config.php 1.25 + for captname in \ 1.26 + b2evo captcha_php csi freecap hec hn_captcha opencaptcha \ 1.27 + phpcaptcha quickcaptcha quickform recaptcha textcaptcha 1.28 + do 1.29 + mv \ 1.30 + captcha/backends/${captname}/${captname}_config_example.php \ 1.31 + captcha/backends/${captname}/${captname}_config.php 1.32 + done 1.33 %{l_shtool} install -c -m 644 \ 1.34 smime/config_example.php \ 1.35 smime/config.php 1.36 @@ -513,7 +518,6 @@ 1.37 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ 1.38 %{l_files_std} \ 1.39 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/etc/squirrelmail/*' \ 1.40 - 1.41 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/prefs/*' \ 1.42 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/squirrelspell/sqspell_config.php' \ 1.43 %if "%{with_plugins}" == "yes" 1.44 @@ -527,6 +531,7 @@ 1.45 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/ldifimport/config.php' \ 1.46 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/pupdate/config.php' \ 1.47 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/show_user_and_ip/config.php' \ 1.48 + '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/squirrel_logger/config.php' \ 1.49 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/vkeyboard/config.php' \ 1.50 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/username/config.php' \ 1.51 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/login_notes/config.php' \ 1.52 @@ -538,16 +543,12 @@ 1.53 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/freecap/freecap_config.php' \ 1.54 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/hec/hec_config.php' \ 1.55 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/hn_captcha/hn_captcha_config.php' \ 1.56 - '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/index.php/index.php_config.php' \ 1.57 - '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/meezerk/meezerk_config.php' \ 1.58 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/opencaptcha/opencaptcha_config.php' \ 1.59 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/phpcaptcha/phpcaptcha_config.php' \ 1.60 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/quickcaptcha/quickcaptcha_config.php' \ 1.61 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/quickform/quickform_config.php' \ 1.62 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/recaptcha/recaptcha_config.php' \ 1.63 - '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/textcapnum/textcapnum_config.php' \ 1.64 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/textcaptcha/textcaptcha_config.php' \ 1.65 - '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/captcha/backends/watercap/watercap_config.php' \ 1.66 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/smime/config.php' \ 1.67 '%attr(640,%{l_musr},%{l_ngrp}) %config %{l_prefix}/share/squirrelmail/plugins/debugger/setup.php' \ 1.68 %endif
