Hello community,
here is the log from the commit of package roundcubemail for openSUSE:Factory
checked in at 2014-03-01 21:22:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/roundcubemail (Old)
and /work/SRC/openSUSE:Factory/.roundcubemail.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "roundcubemail"
Changes:
--------
--- /work/SRC/openSUSE:Factory/roundcubemail/roundcubemail.changes
2013-12-09 07:18:10.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.roundcubemail.new/roundcubemail.changes
2014-03-01 21:22:26.000000000 +0100
@@ -1,0 +2,19 @@
+Mon Feb 24 14:02:07 UTC 2014 - a...@ajaissle.de
+
+- Dropped SQL_dir.patch, it's way easier to maintain to just create
+ a symlink.
+
+-------------------------------------------------------------------
+Fri Jan 10 17:54:21 UTC 2014 - a...@ajaissle.de
+
+- Fixed typo in apache2 config file
+
+-------------------------------------------------------------------
+Fri Jan 10 15:58:15 UTC 2014 - a...@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
+
+-------------------------------------------------------------------
Old:
----
roundcubemail-config-dir.patch
New:
----
roundcubemail-0.9.1_config-dir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ roundcubemail.spec ++++++
--- /var/tmp/diff_new_pack.mO8nAF/_old 2014-03-01 21:22:27.000000000 +0100
+++ /var/tmp/diff_new_pack.mO8nAF/_new 2014-03-01 21:22:27.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package roundcubemail
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,8 +29,8 @@
Source2: %{name}-httpd.conf
Source4: README.openSUSE
Source5: %{name}.logrotate
-# PATCH-FIX-OPENSUSE use the general config directory /etc
-Patch0: %{name}-config-dir.patch
+# PATCH-FIX-OPENSUSE roundcubemail-0.9.1_config-dir.patch -- use the general
config directory /etc
+Patch0: %{name}-0.9.1_config-dir.patch
BuildArch: noarch
BuildRequires: apache2-devel
@@ -154,6 +154,9 @@
mv -v %{buildroot}%{roundcubepath}/$i
%{buildroot}%{_defaultdocdir}/%{name}/
done
+# create a link for SQL
+%{__ln_s} %{_defaultdocdir}/%{name}/SQL %{buildroot}%{roundcubepath}/SQL
+
# fdupes
%if 0%{suse_version} >= 1100
%fdupes %{buildroot}%{roundcubepath}
@@ -271,6 +274,7 @@
%{roundcubepath}/plugins/
%{roundcubepath}/program/
%{roundcubepath}/skins/
+%{roundcubepath}/SQL
%{roundcubepath}/temp
%dir %{_datadir}/php5
%{_datadir}/php5/Roundcube/
++++++ roundcubemail-0.9.1_config-dir.patch ++++++
diff --git a/installer/index.php b/installer/index.php
index 0e80b1c..0123a70 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -41,7 +41,7 @@ ini_set('display_errors', 1);
define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
define('RCUBE_INSTALL_PATH', INSTALL_PATH);
-define('RCUBE_CONFIG_DIR', INSTALL_PATH . 'config/');
+define('RCUBE_CONFIG_DIR', '/etc/roundcubemail/');
$include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
$include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR;
diff --git a/program/include/iniset.php b/program/include/iniset.php
index ca17640..b6da3a6 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -29,7 +29,7 @@ if (!defined('INSTALL_PATH')) {
}
if (!defined('RCMAIL_CONFIG_DIR')) {
- define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
+ define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail/');
}
if (!defined('RCUBE_LOCALIZATION_DIR')) {
++++++ roundcubemail-httpd.conf ++++++
--- /var/tmp/diff_new_pack.mO8nAF/_old 2014-03-01 21:22:27.000000000 +0100
+++ /var/tmp/diff_new_pack.mO8nAF/_new 2014-03-01 21:22:27.000000000 +0100
@@ -26,7 +26,7 @@
Allow from all
</IfModule>
- Options -Indexes FollowSymLinks
+ Options -Indexes +FollowSymLinks
<IfModule mod_php5.c>
php_flag display_errors Off
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
