- allow empty config file to proceed installation as we package default config empty...

Changed files:
    dokuwiki.spec -> 1.56
    install.patch -> 1.1

diff --git a/dokuwiki.spec b/dokuwiki.spec
index f130a59546683b3adac7d51ae238cfb920d6adc2..3a8a1af2907906f773d78f759bdaf021251d01e9 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -35,6 +35,7 @@ Patch14:      interwiki-outputonly.patch
 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
@@ -110,6 +111,7 @@ pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 find -name _dummy | xargs rm
 rm -f lib/index.html lib/plugins/index.html

diff --git a/install.patch b/install.patch
new file mode 100644 (file)
index 0000000..d361345
--- /dev/null
+++ b/install.patch
@@ -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;