From 73ec261687c9ac2661e4a189a12a7759885069a74e26424f8ce09fca4f717762 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Fri, 10 Jan 2014 18:54:02 +0000 Subject: [PATCH 1/3] Accepting request 213518 from home:aeneas_jaissle:branches:server:php:applications * 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 --- ...ch => roundcubemail-0.9.1_config-dir.patch | 0 roundcubemail-0.9.5_SQL_dir.patch | 53 +++++++++++++++++++ roundcubemail-httpd.conf | 2 +- roundcubemail.changes | 11 ++++ roundcubemail.spec | 9 ++-- 5 files changed, 71 insertions(+), 4 deletions(-) rename roundcubemail-config-dir.patch => roundcubemail-0.9.1_config-dir.patch (100%) create mode 100644 roundcubemail-0.9.5_SQL_dir.patch diff --git a/roundcubemail-config-dir.patch b/roundcubemail-0.9.1_config-dir.patch similarity index 100% rename from roundcubemail-config-dir.patch rename to roundcubemail-0.9.1_config-dir.patch diff --git a/roundcubemail-0.9.5_SQL_dir.patch b/roundcubemail-0.9.5_SQL_dir.patch new file mode 100644 index 0000000..ef161ab --- /dev/null +++ b/roundcubemail-0.9.5_SQL_dir.patch @@ -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 diff --git a/roundcubemail-httpd.conf b/roundcubemail-httpd.conf index 0f4f6bb..8875cb9 100644 --- a/roundcubemail-httpd.conf +++ b/roundcubemail-httpd.conf @@ -26,7 +26,7 @@ AddType text/x-component .htc Allow from all - Options -Indexes FollowSymLinks + Options -Indexes +FollowSymLinks php_flag display_errors Off diff --git a/roundcubemail.changes b/roundcubemail.changes index a676b8d..502b6af 100644 --- a/roundcubemail.changes +++ b/roundcubemail.changes @@ -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 diff --git a/roundcubemail.spec b/roundcubemail.spec index 9b12e59..acce9b8 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -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} . From 1c8a32a34f20c55b316b3810c75b1b4129a9fe2b23e5f0bde33f88ffc73dfcba Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 25 Feb 2014 08:18:55 +0000 Subject: [PATCH 2/3] Accepting request 223707 from home:aeneas_jaissle:branches:server:php:applications Dropped SQL_dir.patch, it's way easier to maintain to just create a symlink. OBS-URL: https://build.opensuse.org/request/show/223707 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/roundcubemail?expand=0&rev=68 --- roundcubemail.changes | 6 ++++++ roundcubemail.spec | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/roundcubemail.changes b/roundcubemail.changes index 502b6af..50f66fd 100644 --- a/roundcubemail.changes +++ b/roundcubemail.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 24 14:02:07 UTC 2014 - aj@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 - aj@ajaissle.de diff --git a/roundcubemail.spec b/roundcubemail.spec index acce9b8..833998a 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -31,8 +31,6 @@ Source4: README.openSUSE Source5: %{name}.logrotate # 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 @@ -91,7 +89,6 @@ 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} . @@ -157,6 +154,9 @@ for i in CHANGELOG UPGRADING LICENSE README.md README.openSUSE SQL; do 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} @@ -274,6 +274,7 @@ exit 0 %{roundcubepath}/plugins/ %{roundcubepath}/program/ %{roundcubepath}/skins/ +%{roundcubepath}/SQL %{roundcubepath}/temp %dir %{_datadir}/php5 %{_datadir}/php5/Roundcube/ From 88b40b0f664e52569c1e05b3e7a5207bd9e641978653a5d780e0ae1f52e0f292 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sat, 1 Mar 2014 17:24:32 +0000 Subject: [PATCH 3/3] 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