Author: glen Date: Tue Nov 10 06:10:10 2009 GMT Module: packages Tag: HEAD ---- Log message: - allow empty config file to proceed installation as we package default config empty in first install
---- Files affected: packages/dokuwiki: dokuwiki.spec (1.55 -> 1.56) , install.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/dokuwiki/dokuwiki.spec diff -u packages/dokuwiki/dokuwiki.spec:1.55 packages/dokuwiki/dokuwiki.spec:1.56 --- packages/dokuwiki/dokuwiki.spec:1.55 Tue Oct 13 03:20:22 2009 +++ packages/dokuwiki/dokuwiki.spec Tue Nov 10 07:10:04 2009 @@ -36,6 +36,7 @@ Patch15: simplepie.patch Patch16: cliapps.patch Patch17: plugin_exists-check.patch +Patch18: install.patch URL: http://wiki.splitbrain.org/wiki:dokuwiki BuildRequires: rpmbuild(macros) >= 1.520 Requires: geshi >= 1.0.7.19 @@ -111,6 +112,7 @@ %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 find -name _dummy | xargs rm rm -f lib/index.html lib/plugins/index.html @@ -322,6 +324,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.56 2009/11/10 06:10:04 glen +- allow empty config file to proceed installation as we package default config empty in first install + Revision 1.55 2009/10/13 01:20:22 glen - silently check if plugin exists; rel 7 ================================================================ Index: packages/dokuwiki/install.patch diff -u /dev/null packages/dokuwiki/install.patch:1.1 --- /dev/null Tue Nov 10 07:10:10 2009 +++ packages/dokuwiki/install.patch Tue Nov 10 07:10:04 2009 @@ -0,0 +1,11 @@ +--- dokuwiki-2009-02-14/install.php~ 2009-11-10 07:54:33.847106003 +0200 ++++ dokuwiki-2009-02-14/install.php 2009-11-10 07:54:11.370025985 +0200 +@@ -373,7 +373,7 @@ + + // configs shouldn't exist + foreach ($config_files as $file) { +- if (@file_exists($file)) { ++ if (@file_exists($file) && filesize($file)) { + $file = str_replace($_SERVER['DOCUMENT_ROOT'],'{DOCUMENT_ROOT}/', $file); + $error[] = sprintf($lang['i_confexists'],$file); + $ok = false; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki.spec?r1=1.55&r2=1.56&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
