Kolab Groupware OBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 25

roundcubemail.spec Changed

@@ -14,6 +14,7 @@
 
 %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
 
+# Needed to reload the webserver if APC is installed/enabled.
 %if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
 %global with_systemd 0
 %else
@@ -33,11 +34,11 @@
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
 
 # Paths. Do not include trailing slash
-%global roundcube %{_datadir}/roundcubemail
-%global roundcube_plugins %{roundcube}/plugins
-%global roundcube_conf %{_sysconfdir}/roundcubemail
-%global roundcube_log /var/log/roundcubemail
-%global roundcube_lib /var/lib/roundcubemail
+%global datadir %{_datadir}/roundcubemail
+%global plugindir %{datadir}/plugins
+%global confdir %{_sysconfdir}/roundcubemail
+%global logdir /var/log/roundcubemail
+%global tmpdir /var/lib/roundcubemail
 
 Name:           roundcubemail
 Version:        1.1
@@ -52,12 +53,16 @@
 
 # From GIT 6c1c60f3b908aa922a46cbae94a03eb162147b70
 Source0:        roundcubemail-1.1.tar.gz
+Source1:        comm.py
 
 Source20:       roundcubemail.conf
 Source21:       roundcubemail.logrotate
 
 Patch1:         roundcubemail-1.1-csrf.patch
 
+# https://github.com/roundcube/roundcubemail/pull/215
+Patch2:         roundcubemail-1.1-assets.patch
+
 Patch201:       ticket-466-changes.patch
 Patch202:       default-configuration.patch
 
@@ -69,6 +74,22 @@
 BuildRequires:  uglify-js
 %endif
 
+Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-acl) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-password) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-managesieve) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description
+Roundcube is the world's most popular webmail software.
+
+This is a meta-package that installs an appropriate bare minimum.
+
+%package core
+Summary:        The core of the Roundcube program
+Group:          Applications/Internet
+Provides:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
+
 %if 0%{?suse_version}
 Requires:       http_daemon
 Requires:       php >= 5.3
@@ -97,195 +118,1821 @@
 Requires:       php-pear(Net_SMTP)
 Requires:       php-pear(Net_Socket)
 
-%description
-RoundCube Webmail is a browser-based multilingual IMAP client
-with an application-like user interface. It provides full
-functionality you expect from an e-mail client, including MIME
-support, address book, folder manipulation, message searching
-and spell checking. RoundCube Webmail is written in PHP and
-requires the MySQL database or the PostgreSQL database. The user
-interface is fully skinnable using XHTML and CSS 2.
+Requires:       %{name}(core-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+# The filesystem_attachments plugin is required.
+Requires:       %{name}(plugin-filesystem_attachments) = %{?epoch:%{epoch}:}%{version}-%{release}
+# The jqueryui plugin is required.
+Requires:       %{name}(plugin-jqueryui) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description core
+The Roundcube program core functionality
+
+%package core-assets
+Summary:        Assets for Roundcube
+Group:          Applications/Internet
+Provides:       %{name}(core-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description core-assets
+The assets sub-packages contains solely the static content
+needed by Roundcube.
+
+%package plugin-acl
+Summary:        Plugin acl
+Group:          Applications/Internet
+Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-acl-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-acl-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-acl) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-acl
+Plugin acl
+
+%package plugin-additional_message_headers
+Summary:        Plugin additional_message_headers
+Group:          Applications/Internet
+Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-additional_message_headers-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-additional_message_headers-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-additional_message_headers) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-additional_message_headers
+Plugin additional_message_headers
+
+%package plugin-archive
+Summary:        Plugin archive
+Group:          Applications/Internet
+Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-archive-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-archive-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-archive) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-archive
+Plugin archive
+
+%package plugin-attachment_reminder
+Summary:        Plugin attachment_reminder
+Group:          Applications/Internet
+Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-attachment_reminder-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-attachment_reminder-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-attachment_reminder) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-attachment_reminder
+Plugin attachment_reminder
+
+%package plugin-autologon
+Summary:        Plugin autologon
+Group:          Applications/Internet
+Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-autologon-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-autologon-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-autologon) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-autologon
+Plugin autologon
+
+%package plugin-database_attachments
+Summary:        Plugin database_attachments
+Group:          Applications/Internet
+Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-database_attachments-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-database_attachments-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-database_attachments) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-database_attachments
+Plugin database_attachments
+
+%package plugin-debug_logger
+Summary:        Plugin debug_logger
+Group:          Applications/Internet
+Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-debug_logger-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-debug_logger-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-debug_logger) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-debug_logger
+Plugin debug_logger
+
+%package plugin-emoticons
+Summary:        Plugin emoticons
+Group:          Applications/Internet
+Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-emoticons-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-emoticons-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-emoticons) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-emoticons
+Plugin emoticons
+
+%package plugin-enigma
+Summary:        Plugin enigma
+Group:          Applications/Internet
+Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-enigma-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-enigma-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-enigma) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-enigma
+Plugin enigma
+
+%package plugin-example_addressbook
+Summary:        Plugin example_addressbook
+Group:          Applications/Internet
+Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-example_addressbook-assets) = %{?epoch:%{epoch}:}%{version}-%{release}

roundcubemail-1.1-assets.patch Added

@@ -0,0 +1,36 @@
+commit 21b9c3b6c012822b60a8fb4cb9a59247eaa2d156
+Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
+Date:   Thu Aug 28 18:56:15 2014 +0200
+
+    Allow assets to be entirely separated from the main Roundcube program facilities.
+
+diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
+index a848246..d196ec1 100644
+--- a/program/include/rcmail_output_html.php
++++ b/program/include/rcmail_output_html.php
+@@ -263,6 +263,14 @@ EOF;
+             if (is_file($path)) {
+                 return $skin_path . $file;
+             }
++
++            $path = rtrim(RCUBE_INSTALL_PATH, '/');
++            $path .= '/' . $skin_path . $file;
++            $path = realpath($path);
++
++            if ($skin_path[0] != '/' && is_file($path)) {
++                return $path;
++            }
+         }
+ 
+         return false;
+@@ -503,6 +511,10 @@ EOF;
+                 }
+             }
+ 
++            if (!is_readable($path) && $path[0] != '/' && is_readable(rtrim(RCUBE_INSTALL_PATH, '/') . '/' . $path)) {
++                $path = rtrim(RCUBE_INSTALL_PATH, '/') . '/' . $path;
++            }
++
+             if (is_readable($path)) {
+                 $this->config->set('skin_path', $skin_path);
+                 $this->base_path = preg_replace('!plugins/\w+/!', '', $skin_path);  // set base_path to core skin directory (not plugin's skin)

comm.py Added