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

Accepting request 213518 from home:aeneas_jaissle:branches:server:php:applications

Browse Source 
* 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
This commit is contained in:
Wolfgang Rosenauer 2014-01-10 18:54:02 +00:00 committed by Git OBS Bridge
parent bc0146d8b0
commit 73ec261687
5 changed files with 71 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
roundcubemail-config-dir.patch → roundcubemail-0.9.1_config-dir.patch
View File

53
roundcubemail-0.9.5_SQL_dir.patch Normal file
View File

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

2
roundcubemail-httpd.conf
View File

@ -26,7 +26,7 @@ AddType text/x-component .htc
Allow from all
</IfModule>
Options -Indexes FollowSymLinks
Options -Indexes +FollowSymLinks
<IfModule mod_php5.c>
php_flag display_errors Off

11
roundcubemail.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Jan 10 17:54:21 UTC 2014 - aj@ajaissle.de
- Fixed typo in apache2 config file
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Fri Nov 22 15:46:06 UTC 2013 - aj@ajaissle.de

9
roundcubemail.spec
View File

@ -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,10 @@ Source1: %{name}-rpmlintrc
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
# PATCH-FIX-OPENSUSE 0.9.5_SQL_dir.patch -- SQL files are located in _docdir
Patch1: %{name}-0.9.5_SQL_dir.patch
BuildArch: noarch
BuildRequires: apache2-devel
@ -89,6 +91,7 @@ The user interface is fully skinnable using XHTML and CSS 2.
%prep
%setup -q -n %{name}-%{version}-dep
%patch0 -p1
%patch1 -p1
cp %{SOURCE4} .
cp %{SOURCE5} .