rpm/roundcubemail
SHA256
1
0
Fork 0
forked from pool/roundcubemail
Code Pull Requests Activity

Accepting request 224324 from home:wrosenauer

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/224324
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/roundcubemail?expand=0&rev=69
This commit is contained in:
Wolfgang Rosenauer
2014-03-01 17:24:32 +00:00
committed by Git OBS Bridge
parent 1c8a32a34f
commit 88b40b0f66
2 changed files with 4 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
roundcubemail-0.9.5_SQL_dir.patch
View File

@@ -1,53 +0,0 @@
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

6
roundcubemail.changes
View File

@@ -12,8 +12,10 @@ Fri Jan 10 17:54:21 UTC 2014 - aj@ajaissle.de
-------------------------------------------------------------------
Fri Jan 10 15:58:15 UTC 2014 - aj@ajaissle.de
- Renamed Patch0 (was: roundcubemail-config-dir.patch, now is: roundcubemail-0.9.1_config-dir.patch)
- PATCH-FIX-OPENSUSE roundcubemail-0.9.5_SQL_dir.pacth -- SQL files are located in _docdir
- Renamed Patch0 (was: roundcubemail-config-dir.patch, now is:
roundcubemail-0.9.1_config-dir.patch)
- PATCH-FIX-OPENSUSE roundcubemail-0.9.5_SQL_dir.pacth -- SQL files
are located in _docdir
-------------------------------------------------------------------
Fri Nov 22 15:46:06 UTC 2013 - aj@ajaissle.de