From 15932e9226cf9b6584699a3ecb0f6aec651ce385b7946720fb78de5af99f0b70 Mon Sep 17 00:00:00 2001
From: Andrej Semen <andrej.semen@suse.com>
Date: Fri, 30 Sep 2011 14:31:32 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/server:php:applications/roundcubemail?expand=0&rev=31

---
 roundcubemail-config-dir.patch | 20 ++++++++++----------
 roundcubemail.spec             |  2 --
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/roundcubemail-config-dir.patch b/roundcubemail-config-dir.patch
index 60799a4..31de876 100644
--- a/roundcubemail-config-dir.patch
+++ b/roundcubemail-config-dir.patch
@@ -1,23 +1,23 @@
-diff -ur roundcubemail-0.5.1.old/installer/index.php roundcubemail-0.5.1/installer/index.php
---- roundcubemail-0.5.1.old/installer/index.php	2010-09-25 15:03:53.000000000 +0200
-+++ roundcubemail-0.5.1/installer/index.php	2011-02-21 11:03:44.000000000 +0100
-@@ -4,7 +4,7 @@
+--- roundcubemail-0.6.old/installer/index.php	2011-09-05 10:49:04.000000000 +0200
++++ roundcubemail-0.6/installer/index.php	2011-09-30 16:22:07.248970217 +0200
+@@ -32,7 +32,8 @@
  ini_set('display_errors', 1);
  
  define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
 -define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
 +define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
++
  
  $include_path  = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
  $include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR;
-diff -ur roundcubemail-0.5.1.old/program/include/iniset.php roundcubemail-0.5.1/program/include/iniset.php
---- roundcubemail-0.5.1.old/program/include/iniset.php	2011-01-29 15:55:12.000000000 +0100
-+++ roundcubemail-0.5.1/program/include/iniset.php	2011-02-21 11:02:18.000000000 +0100
-@@ -40,14 +40,13 @@
+--- roundcubemail-0.6.old/program/include/iniset.php	2011-09-28 21:16:41.000000000 +0200
++++ roundcubemail-0.6/program/include/iniset.php	2011-09-30 16:25:26.292976385 +0200
+@@ -41,15 +41,13 @@
  define('RCMAIL_CHARSET', 'UTF-8');
  define('JS_OBJECT_NAME', 'rcmail');
  define('RCMAIL_START', microtime(true));
 +define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
++
  
  if (!defined('INSTALL_PATH')) {
      define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
@@ -26,7 +26,7 @@ diff -ur roundcubemail-0.5.1.old/program/include/iniset.php roundcubemail-0.5.1/
 -if (!defined('RCMAIL_CONFIG_DIR')) {
 -    define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
 -}
-+
- 
+-
  // make sure path_separator is defined
  if (!defined('PATH_SEPARATOR')) {
+     define('PATH_SEPARATOR', (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') ? ';' : ':');
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 87cac9a..d516910 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -105,11 +105,9 @@ rm -rf %buildroot
 %attr(0755,root,root) %{roundcubepath}/bin/*.sh
 %dir %{roundcubepath}/bin
 %{roundcubepath}/installer/
-%{roundcubepath}/installer/index.php.orig
 %{roundcubepath}/logs/
 %{roundcubepath}/plugins/
 %{roundcubepath}/program/
-%{roundcubepath}/program/include/iniset.php.orig
 %{roundcubepath}/skins/
 %attr(-, wwwrun, root) %{roundcubepath}/temp/