forked from pool/roundcubemail
73ec261687
* Patch to point the installer to the SQL file location * Renamed * Fixed apache2 config to work with apache 2.4 OBS-URL: https://build.opensuse.org/request/show/213518 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/roundcubemail?expand=0&rev=67
54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
diff -Ppru a/bin/update.sh b/bin/update.sh
|
|
--- a/bin/update.sh 2013-10-21 21:39:23.000000000 +0200
|
|
+++ b/bin/update.sh 2014-01-10 16:54:14.122476642 +0100
|
|
@@ -147,7 +147,7 @@ if ($RCI->configured) {
|
|
if ($RCI->config['db_dsnw']) {
|
|
echo "Executing database schema update.\n";
|
|
system(INSTALL_PATH . "bin/updatedb.sh --package=roundcube --version=" . $opts['version']
|
|
- . " --dir=" . INSTALL_PATH . DIRECTORY_SEPARATOR . "SQL", $res);
|
|
+ . " --dir=" . DOC_PATH . DIRECTORY_SEPARATOR . "SQL", $res);
|
|
|
|
$success = !$res;
|
|
}
|
|
diff -Ppru a/installer/rcube_install.php b/installer/rcube_install.php
|
|
--- a/installer/rcube_install.php 2013-10-21 21:39:23.000000000 +0200
|
|
+++ b/installer/rcube_install.php 2014-01-10 16:50:35.062609607 +0100
|
|
@@ -367,7 +367,7 @@ class rcube_install
|
|
return false;
|
|
|
|
// read reference schema from mysql.initial.sql
|
|
- $db_schema = $this->db_read_schema(INSTALL_PATH . 'SQL/mysql.initial.sql');
|
|
+ $db_schema = $this->db_read_schema(DOC_PATH . 'SQL/mysql.initial.sql');
|
|
$errors = array();
|
|
|
|
// check list of tables
|
|
@@ -616,7 +616,7 @@ class rcube_install
|
|
$engine = $DB->db_provider;
|
|
|
|
// read schema file from /SQL/*
|
|
- $fname = INSTALL_PATH . "SQL/$engine.initial.sql";
|
|
+ $fname = DOC_PATH . "SQL/$engine.initial.sql";
|
|
if ($sql = @file_get_contents($fname)) {
|
|
$this->exec_sql($sql, $DB);
|
|
}
|
|
@@ -645,7 +645,7 @@ class rcube_install
|
|
{
|
|
system(INSTALL_PATH . "bin/updatedb.sh --package=roundcube"
|
|
. " --version=" . escapeshellarg($version)
|
|
- . " --dir=" . INSTALL_PATH . "SQL"
|
|
+ . " --dir=" . DOC_PATH . "SQL"
|
|
. " 2>&1", $result);
|
|
|
|
return !$result;
|
|
diff -Ppru a/program/include/iniset.php b/program/include/iniset.php
|
|
--- a/program/include/iniset.php 2013-10-21 21:39:23.000000000 +0200
|
|
+++ b/program/include/iniset.php 2014-01-10 16:49:21.280343926 +0100
|
|
@@ -38,6 +38,7 @@ if (!defined('RCUBE_LOCALIZATION_DIR'))
|
|
|
|
define('RCUBE_INSTALL_PATH', INSTALL_PATH);
|
|
define('RCUBE_CONFIG_DIR', RCMAIL_CONFIG_DIR.'/');
|
|
+define('DOC_PATH', '/usr/share/doc/packages/roundcubemail/');
|
|
|
|
|
|
// RC include folders MUST be included FIRST to avoid other
|