From 88b40b0f664e52569c1e05b3e7a5207bd9e641978653a5d780e0ae1f52e0f292 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Sat, 1 Mar 2014 17:24:32 +0000
Subject: [PATCH] Accepting request 224324 from home:wrosenauer

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
---
 roundcubemail-0.9.5_SQL_dir.patch | 53 -------------------------------
 roundcubemail.changes             |  6 ++--
 2 files changed, 4 insertions(+), 55 deletions(-)
 delete mode 100644 roundcubemail-0.9.5_SQL_dir.patch

diff --git a/roundcubemail-0.9.5_SQL_dir.patch b/roundcubemail-0.9.5_SQL_dir.patch
deleted file mode 100644
index ef161ab..0000000
--- a/roundcubemail-0.9.5_SQL_dir.patch
+++ /dev/null
@@ -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
diff --git a/roundcubemail.changes b/roundcubemail.changes
index 50f66fd..3ca534c 100644
--- a/roundcubemail.changes
+++ b/roundcubemail.changes
@@ -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