Request 2309 (accepted)

Overview

Request 2309 (accepted)

Update roundcube

Created by vanmeeuwen over 6 years ago
In state accepted
Open review for Admin

Submit roundcubemail

Submit package Kolab:Winterfell / roundcubemail to package Kolab:16 / roundcubemail

roundcubemail.spec Changed

@@ -12,6 +12,8 @@
 #!BuildIgnore:  php-mysql
 %endif
 
+%global bootstrap 0
+
 %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
 
 # Needed to reload the webserver if APC is installed/enabled.
@@ -46,10 +48,15 @@
 %global logdir /var/log/roundcubemail
 %global tmpdir /var/lib/roundcubemail
 
+%global rc_version 1.4
+%global rc_rel_suffix beta36
+%global dot_rel_suffix %{?rc_rel_suffix:.%{rc_rel_suffix}}
+%global dash_rel_suffix %{?rc_rel_suffix:-%{rc_rel_suffix}}
+
 Name:           roundcubemail
-Version:        1.3.6
+Version:        1.4
 
-Release:        4%{?dist}
+Release:        49%{?dot_rel_suffix}%{?dist}
 
 Summary:        Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -57,7 +64,7 @@
 License:        GPLv2
 URL:            http://www.roundcube.net
 
-Source0:        roundcubemail-%{version}.tar.gz
+Source0:        roundcubemail-%{version}%{?dash_rel_suffix}.tar.gz
 Source1:        comm.py
 
 Source20:       roundcubemail.conf
@@ -69,13 +76,7 @@
 
 Source200:      2017111400.sql
 
-Patch0002:      0002-Parse-all-quotas-from-GETQUOTAROOT-6280.patch
-Patch0003:      0003-Update-changelog.patch
-Patch0004:      0004-Fix-bug-where-some-escape-sequences-in-html-styles-c.patch
-Patch0005:      0005-Fix-bug-where-some-forbidden-characters-on-Cyrus-IMA.patch
-
 Patch201:       default-configuration.patch
-Patch202:       roundcubemail-1.3.6-plugin-enigma-homedir.patch
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
@@ -106,15 +107,23 @@
 BuildRequires:  php-pear(MDB2_Driver_mysqli)
 BuildRequires:  php-pear(Net_IDNA2)
 BuildRequires:  php-pear(Net_LDAP2)
-BuildRequires:  php-pear(Net_LDAP3)
+BuildRequires:  php-kolab-net-ldap3
 BuildRequires:  php-pear(Net_Sieve)
 BuildRequires:  php-pear(Net_SMTP)
 BuildRequires:  php-pear(Net_Socket)
 %endif
 
+%if "%{_arch}" != "ppc64" && "%{_arch}" != "ppc64le"
+BuildRequires:  nodejs-less
+%if 0%{?suse_version} < 1
+BuildRequires:  uglify-js
+%endif
+%else
+BuildRequires:  php-lessphp
+%endif
+
 %if "%{_arch}" != "ppc64" && "%{_arch}" != "ppc64le" && 0%{?suse_version} < 1
 BuildRequires:  python-cssmin
-BuildRequires:  uglify-js
 %endif
 
 # This can, regrettably, not be BuildRequires'ed, since the OSC
@@ -128,6 +137,7 @@
 
 %if 0%{?plesk}
 Requires:       %{name}-skin-plesk
+Requires:       %{name}-skin-plesk-larry
 %else
 %if 0%{?kolab_enterprise}
 Requires:       %{name}-skin-enterprise
@@ -188,11 +198,29 @@
 
 %if 0%{?plesk} < 1
 Requires:       php-pear(Net_LDAP2)
-Requires:       php-pear(Net_LDAP3)
+Requires:       php-kolab-net-ldap3
+%endif
+
+%if 0%{?plesk}
+%if 0%{?bootstrap} < 1
+Requires:       %{name}(skin-plesk)
+Requires:       %{name}(skin-plesk-larry)
+Requires:       %{name}(skin-plesk-larry-assets)
+%endif
+%else
+%if 0%{?kolab_enterprise}
+%if 0%{?bootstrap} < 1
+Requires:       %{name}(skin-enterprise)
+Requires:       %{name}(skin-kolab)
+%endif
+%else
+Requires:       %{name}(skin-chameleon)
+Requires:       %{name}(skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
 %endif
 
 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}
@@ -224,7 +252,24 @@
 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}
+%if 0%{?plesk}
+%if 0%{?bootstrap} < 1
+Requires:       %{name}(plugin-acl-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-plesk) >= 0.4
+Requires:       %{name}(skin-plesk-larry) >= 0.3
+%endif
+%else
+%if 0%{?kolab_enterprise}
+%if 0%{?bootstrap} < 1
+Requires:       %{name}(skin-enterprise) >= 0.3.7
+Requires:       %{name}(skin-kolab) >= 0.4
+%endif
+%else
+Requires:       %{name}(skin-chameleon) >= 0.3.9
+Requires:       %{name}(plugin-acl-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-acl-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%endif
 Provides:       %{name}(plugin-acl) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-acl
@@ -235,6 +280,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-additional_message_headers-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-additional_message_headers-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-additional_message_headers-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-additional_message_headers-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-additional_message_headers-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-additional_message_headers) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-additional_message_headers
@@ -245,7 +294,10 @@
 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}
+Obsoletes:      %{name}-plugin-archive-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-archive-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-archive-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-archive-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-archive) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-archive
@@ -256,6 +308,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-attachment_reminder-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-attachment_reminder-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-attachment_reminder-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-attachment_reminder-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-attachment_reminder-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-attachment_reminder) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-attachment_reminder
@@ -266,6 +322,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-autologon-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-autologon-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-autologon-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-autologon-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-autologon-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-autologon) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-autologon
@@ -276,6 +336,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-database_attachments-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-database_attachments-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-database_attachments-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-database_attachments-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-database_attachments-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-database_attachments) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-database_attachments
@@ -286,6 +350,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-debug_logger-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-debug_logger-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-debug_logger-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-debug_logger-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-debug_logger-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-debug_logger) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-debug_logger
@@ -296,6 +364,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-emoticons-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-emoticons-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-emoticons-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-emoticons-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-emoticons-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-emoticons) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-emoticons
@@ -306,8 +378,24 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-enigma-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       php-pear-crypt-gpg
-Requires:       %{name}(plugin-enigma-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?plesk}
+%if 0%{?bootstrap} < 1
+Requires:       %{name}(plugin-enigma-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-plesk) >= 0.4
+Requires:       %{name}(skin-plesk-larry) >= 0.3
+%endif
+%else
+%if 0%{?kolab_enterprise}
+%if 0%{?bootstrap} < 1
+Requires:       %{name}(skin-enterprise) >= 0.3.7
+Requires:       %{name}(skin-kolab) >= 0.4
+%endif
+%else
+Requires:       %{name}(skin-chameleon) >= 0.3.9
+Requires:       %{name}(plugin-enigma-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-enigma-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%endif
 Provides:       %{name}(plugin-enigma) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-enigma
@@ -318,6 +406,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-example_addressbook-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-example_addressbook-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-example_addressbook-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-example_addressbook-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-example_addressbook-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-example_addressbook) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-example_addressbook
@@ -328,6 +420,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-filesystem_attachments-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-filesystem_attachments-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-filesystem_attachments-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-filesystem_attachments-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-filesystem_attachments-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-filesystem_attachments) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-filesystem_attachments
@@ -338,7 +434,24 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-help-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-help-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?plesk}
+%if 0%{?bootstrap} < 1
+Requires:       %{name}(plugin-help-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-plesk) >= 0.4
+Requires:       %{name}(skin-plesk-larry) >= 0.3
+%endif
+%else
+%if 0%{?kolab_enterprise}
+%if 0%{?bootstrap} < 1
+Requires:       %{name}(skin-enterprise) >= 0.3.7
+Requires:       %{name}(skin-kolab) >= 0.4
+%endif
+%else
+Requires:       %{name}(skin-chameleon) >= 0.3.9
+Requires:       %{name}(plugin-help-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-help-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%endif
 Provides:       %{name}(plugin-help) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-help
@@ -349,7 +462,27 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-hide_blockquote-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-hide_blockquote-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?plesk}
+%if 0%{?bootstrap} < 1
+Obsoletes:      %{name}-plugin-hide_blockquote-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-hide_blockquote-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-plesk) >= 0.4
+Requires:       %{name}(skin-plesk-larry) >= 0.3
+%endif
+%else
+%if 0%{?kolab_enterprise}
+%if 0%{?bootstrap} < 1
+Requires:       %{name}(skin-enterprise) >= 0.3.7
+Requires:       %{name}(skin-kolab) >= 0.4
+%endif
+Obsoletes:      %{name}-plugin-hide_blockquote-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-hide_blockquote-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+%else
+Requires:       %{name}(skin-chameleon) >= 0.3.9
+Requires:       %{name}(plugin-hide_blockquote-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-hide_blockquote-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%endif
 Provides:       %{name}(plugin-hide_blockquote) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-hide_blockquote
@@ -360,6 +493,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-http_authentication-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-http_authentication-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-http_authentication-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-http_authentication-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-http_authentication-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-http_authentication) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-http_authentication
@@ -369,6 +506,11 @@
 Summary:        Plugin identicon
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-identicon-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-identicon-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-identicon-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-identicon-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-identicon-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-identicon) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-identicon
@@ -379,6 +521,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-identity_select-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-identity_select-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-identity_select-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-identity_select-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-identity_select-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-identity_select) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-identity_select
@@ -389,7 +535,24 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-jqueryui-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-jqueryui-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?plesk}
+%if 0%{?bootstrap} < 1
+Requires:       %{name}(plugin-jqueryui-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-plesk) >= 0.4
+Requires:       %{name}(skin-plesk-larry) >= 0.3
+%endif
+%else
+%if 0%{?kolab_enterprise}
+%if 0%{?bootstrap} < 1
+Requires:       %{name}(skin-enterprise) >= 0.3.7
+Requires:       %{name}(skin-kolab) >= 0.4
+%endif
+%else
+Requires:       %{name}(skin-chameleon) >= 0.3.9
+Requires:       %{name}(plugin-jqueryui-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-jqueryui-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%endif
 Provides:       %{name}(plugin-jqueryui) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-jqueryui
@@ -400,6 +563,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-krb_authentication-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-krb_authentication-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-krb_authentication-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-krb_authentication-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-krb_authentication-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-krb_authentication) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-krb_authentication
@@ -410,7 +577,24 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-managesieve-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-managesieve-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?plesk}
+%if 0%{?bootstrap} < 1
+Requires:       %{name}(plugin-managesieve-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-plesk) >= 0.4
+Requires:       %{name}(skin-plesk-larry) >= 0.3
+%endif
+%else
+%if 0%{?kolab_enterprise}
+%if 0%{?bootstrap} < 1
+Requires:       %{name}(skin-enterprise) >= 0.3.7
+Requires:       %{name}(skin-kolab) >= 0.4
+%endif
+%else
+Requires:       %{name}(skin-chameleon) >= 0.3.9
+Requires:       %{name}(plugin-managesieve-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-managesieve-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%endif
 Provides:       %{name}(plugin-managesieve) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-managesieve
@@ -421,7 +605,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-markasjunk-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-markasjunk-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-markasjunk-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-markasjunk-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-markasjunk-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-markasjunk-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-markasjunk) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-markasjunk
@@ -432,6 +619,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-new_user_dialog-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-new_user_dialog-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-new_user_dialog-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-new_user_dialog-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-new_user_dialog-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-new_user_dialog) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-new_user_dialog
@@ -442,6 +633,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-new_user_identity-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-new_user_identity-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-new_user_identity-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-new_user_identity-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-new_user_identity-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-new_user_identity) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-new_user_identity
@@ -452,6 +647,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-newmail_notifier-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-newmail_notifier-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-newmail_notifier-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-newmail_notifier-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-newmail_notifier-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-newmail_notifier) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-newmail_notifier
@@ -462,6 +661,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-password-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-password-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-password-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-password-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-password-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-password) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-password
@@ -472,6 +675,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-redundant_attachments-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-redundant_attachments-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-redundant_attachments-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-redundant_attachments-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-redundant_attachments-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-redundant_attachments) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-redundant_attachments
@@ -482,6 +689,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-show_additional_headers-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-show_additional_headers-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-show_additional_headers-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-show_additional_headers-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-show_additional_headers-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-show_additional_headers) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-show_additional_headers
@@ -492,6 +703,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-squirrelmail_usercopy-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-squirrelmail_usercopy-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-squirrelmail_usercopy-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-squirrelmail_usercopy-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-squirrelmail_usercopy-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-squirrelmail_usercopy) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-squirrelmail_usercopy
@@ -502,6 +717,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-subscriptions_option-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-subscriptions_option-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-subscriptions_option-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-subscriptions_option-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-subscriptions_option-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-subscriptions_option) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-subscriptions_option
@@ -512,6 +731,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-userinfo-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-userinfo-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-userinfo-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-userinfo-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-userinfo-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-userinfo) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-userinfo
@@ -522,7 +745,27 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-vcard_attachments-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-vcard_attachments-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?plesk}
+%if 0%{?bootstrap} < 1
+Obsoletes:      %{name}-plugin-vcard_attachments-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-vcard_attachments-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-plesk) >= 0.4
+Requires:       %{name}(skin-plesk-larry) >= 0.3
+%endif
+%else
+%if 0%{?kolab_enterprise}
+%if 0%{?bootstrap} < 1
+Requires:       %{name}(skin-enterprise) >= 0.3.7
+Requires:       %{name}(skin-kolab) >= 0.4
+%endif
+Obsoletes:      %{name}-plugin-vcard_attachments-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-vcard_attachments-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+%else
+Requires:       %{name}(skin-chameleon) >= 0.3.9
+Requires:       %{name}(plugin-vcard_attachments-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-vcard_attachments-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%endif
 Provides:       %{name}(plugin-vcard_attachments) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-vcard_attachments
@@ -533,6 +776,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-virtuser_file-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-virtuser_file-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-virtuser_file-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-virtuser_file-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-virtuser_file-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-virtuser_file) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-virtuser_file
@@ -543,6 +790,10 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-virtuser_query-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-virtuser_query-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-virtuser_query-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-virtuser_query-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-virtuser_query-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-virtuser_query) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-virtuser_query
@@ -553,7 +804,25 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-zipdownload-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-zipdownload-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?plesk}
+%if 0%{?bootstrap} < 1
+Requires:       %{name}(skin-plesk) >= 0.4
+Requires:       %{name}(skin-plesk-larry) >= 0.3
+%endif
+%else
+%if 0%{?kolab_enterprise}
+%if 0%{?bootstrap} < 1
+Requires:       %{name}(skin-enterprise) >= 0.3.7
+Requires:       %{name}(skin-kolab) >= 0.4
+%endif
+%else
+Requires:       %{name}(skin-chameleon) >= 0.3.9
+%endif
+%endif
+Obsoletes:      %{name}-plugin-zipdownload-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-zipdownload-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}-plugin-zipdownload-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}-plugin-zipdownload-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-zipdownload) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-zipdownload
@@ -671,6 +940,14 @@
 %description plugin-http_authentication-assets
 Plugin http_authentication Assets
 
+%package plugin-identicon-assets
+Summary:        Plugin identicon Assets
+Group:          Applications/Internet
+Provides:       %{name}(plugin-identicon-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-identicon-assets
+Plugin identicon Assets
+
 %package plugin-identity_select-assets
 Summary:        Plugin identity_select Assets
 Group:          Applications/Internet
@@ -815,6 +1092,18 @@
 %description plugin-zipdownload-assets
 Plugin zipdownload Assets
 
+%package plugin-acl-skin-elastic
+Summary:        Plugin acl / Skin elastic
+Group:          Applications/Internet
+Requires:       %{name}(plugin-acl) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-acl-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-acl-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-acl-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-acl-skin-elastic
+Plugin acl / Skin elastic
+
 %package plugin-acl-skin-larry
 Summary:        Plugin acl / Skin larry
 Group:          Applications/Internet
@@ -827,17 +1116,17 @@
 %description plugin-acl-skin-larry
 Plugin acl / Skin larry
 
-%package plugin-archive-skin-larry
-Summary:        Plugin archive / Skin larry
+%package plugin-enigma-skin-elastic
+Summary:        Plugin enigma / Skin elastic
 Group:          Applications/Internet
-Requires:       %{name}(plugin-archive) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-archive-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-archive-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-archive-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-enigma) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-enigma-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-enigma-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-enigma-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description plugin-archive-skin-larry
-Plugin archive / Skin larry
+%description plugin-enigma-skin-elastic
+Plugin enigma / Skin elastic
 
 %package plugin-enigma-skin-larry
 Summary:        Plugin enigma / Skin larry
@@ -851,6 +1140,18 @@
 %description plugin-enigma-skin-larry
 Plugin enigma / Skin larry
 
+%package plugin-help-skin-elastic
+Summary:        Plugin help / Skin elastic
+Group:          Applications/Internet
+Requires:       %{name}(plugin-help) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-help-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-help-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-help-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-help-skin-elastic
+Plugin help / Skin elastic
+
 %package plugin-help-skin-larry
 Summary:        Plugin help / Skin larry
 Group:          Applications/Internet
@@ -875,6 +1176,18 @@
 %description plugin-hide_blockquote-skin-larry
 Plugin hide_blockquote / Skin larry
 
+%package plugin-jqueryui-skin-elastic
+Summary:        Plugin jqueryui / Skin elastic
+Group:          Applications/Internet
+Requires:       %{name}(plugin-jqueryui) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-jqueryui-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-jqueryui-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-jqueryui-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-jqueryui-skin-elastic
+Plugin jqueryui / Skin elastic
+
 %package plugin-jqueryui-skin-larry
 Summary:        Plugin jqueryui / Skin larry
 Group:          Applications/Internet
@@ -887,6 +1200,18 @@
 %description plugin-jqueryui-skin-larry
 Plugin jqueryui / Skin larry
 
+%package plugin-managesieve-skin-elastic
+Summary:        Plugin managesieve / Skin elastic
+Group:          Applications/Internet
+Requires:       %{name}(plugin-managesieve) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-managesieve-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-managesieve-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-managesieve-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-managesieve-skin-elastic
+Plugin managesieve / Skin elastic
+
 %package plugin-managesieve-skin-larry
 Summary:        Plugin managesieve / Skin larry
 Group:          Applications/Internet
@@ -899,18 +1224,6 @@
 %description plugin-managesieve-skin-larry
 Plugin managesieve / Skin larry
 
-%package plugin-markasjunk-skin-larry
-Summary:        Plugin markasjunk / Skin larry
-Group:          Applications/Internet
-Requires:       %{name}(plugin-markasjunk) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-markasjunk-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-markasjunk-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-markasjunk-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-markasjunk-skin-larry
-Plugin markasjunk / Skin larry
-
 %package plugin-vcard_attachments-skin-larry
 Summary:        Plugin vcard_attachments / Skin larry
 Group:          Applications/Internet
@@ -935,6 +1248,16 @@
 %description plugin-zipdownload-skin-larry
 Plugin zipdownload / Skin larry
 
+%package plugin-acl-skin-elastic-assets
+Summary:        Plugin acl / Skin elastic (Assets)
+Group:          Applications/Internet
+Requires:       %{name}(plugin-acl-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-acl-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-acl-skin-elastic-assets
+Plugin acl / Skin elastic (Assets Package)
+
 %package plugin-acl-skin-larry-assets
 Summary:        Plugin acl / Skin larry (Assets)
 Group:          Applications/Internet
@@ -945,15 +1268,15 @@
 %description plugin-acl-skin-larry-assets
 Plugin acl / Skin larry (Assets Package)
 
-%package plugin-archive-skin-larry-assets
-Summary:        Plugin archive / Skin larry (Assets)
+%package plugin-enigma-skin-elastic-assets
+Summary:        Plugin enigma / Skin elastic (Assets)
 Group:          Applications/Internet
-Requires:       %{name}(plugin-archive-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-archive-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-enigma-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-enigma-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description plugin-archive-skin-larry-assets
-Plugin archive / Skin larry (Assets Package)
+%description plugin-enigma-skin-elastic-assets
+Plugin enigma / Skin elastic (Assets Package)
 
 %package plugin-enigma-skin-larry-assets
 Summary:        Plugin enigma / Skin larry (Assets)
@@ -965,6 +1288,16 @@
 %description plugin-enigma-skin-larry-assets
 Plugin enigma / Skin larry (Assets Package)
 
+%package plugin-help-skin-elastic-assets
+Summary:        Plugin help / Skin elastic (Assets)
+Group:          Applications/Internet
+Requires:       %{name}(plugin-help-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-help-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-help-skin-elastic-assets
+Plugin help / Skin elastic (Assets Package)
+
 %package plugin-help-skin-larry-assets
 Summary:        Plugin help / Skin larry (Assets)
 Group:          Applications/Internet
@@ -985,6 +1318,16 @@
 %description plugin-hide_blockquote-skin-larry-assets
 Plugin hide_blockquote / Skin larry (Assets Package)
 
+%package plugin-jqueryui-skin-elastic-assets
+Summary:        Plugin jqueryui / Skin elastic (Assets)
+Group:          Applications/Internet
+Requires:       %{name}(plugin-jqueryui-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-jqueryui-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-jqueryui-skin-elastic-assets
+Plugin jqueryui / Skin elastic (Assets Package)
+
 %package plugin-jqueryui-skin-larry-assets
 Summary:        Plugin jqueryui / Skin larry (Assets)
 Group:          Applications/Internet
@@ -995,6 +1338,16 @@
 %description plugin-jqueryui-skin-larry-assets
 Plugin jqueryui / Skin larry (Assets Package)
 
+%package plugin-managesieve-skin-elastic-assets
+Summary:        Plugin managesieve / Skin elastic (Assets)
+Group:          Applications/Internet
+Requires:       %{name}(plugin-managesieve-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-managesieve-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-managesieve-skin-elastic-assets
+Plugin managesieve / Skin elastic (Assets Package)
+
 %package plugin-managesieve-skin-larry-assets
 Summary:        Plugin managesieve / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1005,16 +1358,6 @@
 %description plugin-managesieve-skin-larry-assets
 Plugin managesieve / Skin larry (Assets Package)
 
-%package plugin-markasjunk-skin-larry-assets
-Summary:        Plugin markasjunk / Skin larry (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-markasjunk-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-markasjunk-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-markasjunk-skin-larry-assets
-Plugin markasjunk / Skin larry (Assets Package)
-
 %package plugin-vcard_attachments-skin-larry-assets
 Summary:        Plugin vcard_attachments / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1035,6 +1378,17 @@
 %description plugin-zipdownload-skin-larry-assets
 Plugin zipdownload / Skin larry (Assets Package)
 
+%package skin-elastic
+Summary:        Skin elastic
+Group:          Applications/Internet
+Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description skin-elastic
+Skin elastic
+
 %package skin-larry
 Summary:        Skin larry
 Group:          Applications/Internet
@@ -1046,6 +1400,15 @@
 %description skin-larry
 Skin larry
 
+%package skin-elastic-assets
+Summary:        Skin elastic (Assets)
+Group:          Applications/Internet
+Provides:       %{name}(skin-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description skin-elastic-assets
+Skin elastic (Assets Package)
+
 %package skin-larry-assets
 Summary:        Skin larry (Assets)
 Group:          Applications/Internet
@@ -1056,11 +1419,11 @@
 Skin larry (Assets Package)
 
 %prep
-%setup -q -c "%{name}-%{version}"
+%setup -q -c "%{name}-%{version}%{?dash_rel_suffix}"
 
-pushd %{name}-%{version}
+pushd %{name}-%{version}%{?dash_rel_suffix}
 
-cp -vf %{SOURCE200} SQL/mysql/
+cp -vf "%{SOURCE200}" SQL/mysql/
 rm -rvf SQL/mysql/2016081200.sql
 
 rm -rf temp/js_cache/
@@ -1075,23 +1438,28 @@
 cp -vf %{SOURCE102} plugins/password/config.inc.php.dist
 %endif
 
-%patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-
 %patch201 -p1
-%patch202 -p1
 
 # Remove the results of patching when there's an incidental offset
-find . -type f -name "*.orig" -delete
+find . -type f -name "*.orig" | while read file; do
+    rm -rvf ${file}
+done
 
 # Remove hidden files and directories
-find . -type f -name ".*" -delete
+find . -type f -name ".*" | while read file; do
+    rm -rvf ${file}
+done
+
 find . -type d -name ".*" ! -name "." ! -name ".." | while read dir; do
     rm -rvf ${dir}
 done
 
+while [ ! -z "$(find . -type d -empty)" ]; do
+    find . -type d -empty | while read dir; do
+        rm -rvf ${dir}
+    done
+done
+
 # Remove any reference to sqlite in config file so people don't
 # mistakely assume it works
 %{__sed} -i '/sqlite/d' config/defaults.inc.php
@@ -1101,17 +1469,17 @@
 rm -rf plugins/password/helpers/chpass-wrapper.py
 popd
 
-cp -a %{name}-%{version}/{CHANGELOG,LICENSE,README.md} .
+cp -a %{name}-%{version}%{?dash_rel_suffix}/{CHANGELOG,LICENSE,README.md} .
 
-rm -rf %{name}-%{version}/plugins/jqueryui/themes/redmond
+rm -rf %{name}-%{version}%{?dash_rel_suffix}/plugins/jqueryui/themes/redmond
 
-for skin in larry; do
+for skin in elastic larry; do
     # Template files and the like
-    for sdir in $(find %{name}-%{version}/ -type d -name "${skin}" | sort); do
-        target_dir=$(echo $sdir | %{__sed} -e "s|%{name}-%{version}|%{name}-skin-${skin}-%{version}|g")
-        %{__mkdir_p} $(dirname $target_dir)
+    for sdir in $(find %{name}-%{version}%{?dash_rel_suffix}/ -type d -name "${skin}" | sort); do
+        target_dir=$(echo ${sdir} | %{__sed} -e "s|%{name}-%{version}%{?dash_rel_suffix}|%{name}-skin-${skin}-%{version}%{?dash_rel_suffix}|g")
+        %{__mkdir_p} $(dirname ${target_dir})
         # Copy all, including assets, for the -devel sub-package
-        cp -av $sdir $target_dir
+        cp -av ${sdir} ${target_dir}
     done
 
     (
@@ -1152,18 +1520,18 @@
         echo ""
     ) >> skins-assets.files
 
-    %{__rm} -rf %{name}-skin-${skin}-%{version}/plugins
+    %{__rm} -rf %{name}-skin-${skin}-%{version}%{?dash_rel_suffix}/plugins
 done
 
-for plugin in $(find %{name}-%{version}/plugins -mindepth 1 -maxdepth 1 -type d | sort); do
-    target_dir=$(echo ${plugin} | %{__sed} -e "s|%{name}-%{version}|%{name}-plugin-$(basename ${plugin})-%{version}|g")
-    %{__mkdir_p} $(dirname $target_dir)
-    cp -av ${plugin} $target_dir
+for plugin in $(find %{name}-%{version}%{?dash_rel_suffix}/plugins -mindepth 1 -maxdepth 1 -type d | sort); do
+    target_dir=$(echo ${plugin} | %{__sed} -e "s|%{name}-%{version}%{?dash_rel_suffix}|%{name}-plugin-$(basename ${plugin})-%{version}%{?dash_rel_suffix}|g")
+    %{__mkdir_p} $(dirname ${target_dir})
+    cp -av ${plugin} ${target_dir}
 
     # Special treatment of the jquery plugin
     if [ "$(basename ${plugin})" == "jqueryui" ]; then
-        %{__mv} $target_dir/themes $target_dir/skins
-        %{__sed} -i -e 's/themes/skins/g' $target_dir/{config.inc.php.dist,jqueryui.php,README}
+        %{__mv} ${target_dir}/themes ${target_dir}/skins
+        %{__sed} -i -e 's/themes/skins/g' ${target_dir}/{config.inc.php.dist,jqueryui.php,README}
     fi
 
     (
@@ -1173,7 +1541,38 @@
         echo "Requires:       %%{name}(core) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
         echo "Requires:       %%{name}(plugin-$(basename ${plugin})-assets) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
         if [ -d "${target_dir}/skins/" ]; then
-            echo "Requires:       %%{name}(plugin-$(basename ${plugin})-skin) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+            echo "%%if 0%%{?plesk}"
+            echo "%%if 0%%{?bootstrap} < 1"
+            if [ -d "${target_dir}/skins/elastic/" ]; then
+                echo "Requires:       %%{name}(plugin-$(basename ${plugin})-skin-elastic) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+            else
+                echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-elastic < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+                echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-elastic-assets < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+            fi
+            echo "Requires:       %%{name}(skin-plesk) >= 0.4"
+            echo "Requires:       %%{name}(skin-plesk-larry) >= 0.3"
+            echo "%%endif"
+            echo "%%else"
+            echo "%%if 0%%{?kolab_enterprise}"
+            echo "%%if 0%%{?bootstrap} < 1"
+            echo "Requires:       %%{name}(skin-enterprise) >= 0.3.7"
+            echo "Requires:       %%{name}(skin-kolab) >= 0.4"
+            echo "%%endif"
+            if [ ! -d "${target_dir}/skins/elastic/" ]; then
+                echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-elastic < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+                echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-elastic-assets < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+            fi
+            echo "%%else"
+            echo "Requires:       %%{name}(skin-chameleon) >= 0.3.9"
+            echo "Requires:       %%{name}(plugin-$(basename ${plugin})-skin-elastic) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+            echo "Requires:       %%{name}(plugin-$(basename ${plugin})-skin-larry) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+            echo "%%endif"
+            echo "%%endif"
+        else
+            echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-elastic < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+            echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-elastic-assets < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+            echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-larry < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+            echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-larry-assets < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
         fi
         echo "Provides:       %%{name}(plugin-$(basename ${plugin})) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
         echo ""
@@ -1251,11 +1650,11 @@
         echo ""
     ) >> plugins-assets.files
 
-    for skin in larry; do
-        for dir in $(find $target_dir -type d -name "${skin}" | sort); do
-            starget_dir=$(echo $dir | %{__sed} -e "s|%{name}-plugin-$(basename ${plugin})-%{version}|%{name}-plugin-$(basename ${plugin})-skin-${skin}-%{version}|g")
-            %{__mkdir_p} $(dirname $starget_dir)
-            %{__mv} $dir $starget_dir
+    for skin in elastic larry; do
+        for dir in $(find ${target_dir} -type d -name "${skin}" | sort); do
+            starget_dir=$(echo ${dir} | %{__sed} -e "s|%{name}-plugin-$(basename ${plugin})-%{version}%{?dash_rel_suffix}|%{name}-plugin-$(basename ${plugin})-skin-${skin}-%{version}%{?dash_rel_suffix}|g")
+            %{__mkdir_p} $(dirname ${starget_dir})
+            %{__mv} ${dir} ${starget_dir}
 
             (
                 echo "%package plugin-$(basename ${plugin})-skin-${skin}"
@@ -1321,7 +1720,7 @@
 find | sort | tee files.find >/dev/null
 
 %build
-pushd %{name}-%{version}
+pushd %{name}-%{version}%{?dash_rel_suffix}
 mkdir -p $HOME/.composer
 echo '{}' > $HOME/.composer/composer.json
 cat > composer.json << EOF
@@ -1368,7 +1767,7 @@
     %{buildroot}%{logdir} \
     %{buildroot}%{tmpdir}/plugins
 
-pushd %{name}-%{version}
+pushd %{name}-%{version}%{?dash_rel_suffix}
 
 %if 0%{?plesk} < 1
 %{__install} -pm 644 %SOURCE20 %{buildroot}%{_ap_sysconfdir}/conf.d
@@ -1457,8 +1856,8 @@
 
 %{__mkdir_p} ${asset_path}
 
-orig_dir="%{name}-%{version}"
-asset_dir="%{name}-assets-%{version}$(echo ${asset_path} | %{__sed} -e 's|%{buildroot}%{datadir}||g')"
+orig_dir="%{name}-%{version}%{?dash_rel_suffix}"
+asset_dir="%{name}-assets-%{version}%{?dash_rel_suffix}$(echo ${asset_path} | %{__sed} -e 's|%{buildroot}%{datadir}||g')"
 
 # Remove the skins and installer directories from ${orig_dir}
 %{__rm} -rf ${orig_dir}/{installer,skins}
@@ -1466,29 +1865,36 @@
 echo "Original directory for core: ${orig_dir}"
 echo "Asset directory for core: ${asset_dir}"
 
+# Compile and compress the CSS
+for file in `find ${orig_dir} -type f -name "styles.less" -o -name "print.less" -o -name "embed.less" | grep -vE "${orig_dir}/(plugins|skins)/" `; do
+    asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
+    %{__mkdir_p} ${asset_loc}
+    %{_bindir}/lessc -x ${file} > ${asset_loc}/$(basename ${file} .less).css
+done
+find ${asset_loc} -type f -name "*.css" -empty -delete
+find ${asset_loc} -type d -empty -delete
+
 # Compress the CSS
 for file in `find ${orig_dir} -type f -name "*.css" ! -path "*tests/*" | grep -vE "${orig_dir}/(plugins|skins)/"`; do
     asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
     %{__mkdir_p} ${asset_loc}
-    cat ${file} | python %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) && \
-        %{__rm} -rf ${file} || \
-        %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
+    cat ${file} | python %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) || \
+        %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
 done
 
 # Compress the JS, but not the already minified
 for file in `find ${orig_dir} -type f -name "*.js" ! -name "*.min.js" | grep -vE "${orig_dir}/(plugins|skins)/"`; do
     asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
     %{__mkdir_p} ${asset_loc}
-    uglifyjs ${file} > ${asset_loc}/$(basename ${file}) && \
-        %{__rm} -rf ${file} || \
-        %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
+    uglifyjs ${file} > ${asset_loc}/$(basename ${file}) || \
+        %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
 done
 
 # The already minified JS can just be copied over to the assets location
 for file in `find ${orig_dir} -type f -name "*.min.js" | grep -vE "${orig_dir}/(plugins|skins)/"`; do
     asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
     %{__mkdir_p} ${asset_loc}
-    %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
+    %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
 done
 
 # Other assets
@@ -1507,12 +1913,13 @@
         -name "*.ttf" -o \
         -name "*.wav" -o \
         -name "*.webp" -o \
-        -name "*.woff" | \
+        -name "*.woff" -o \
+        -name "*.woff2" | \
         grep -vE "${orig_dir}/(plugins|skins)/"
     ); do
     asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
     %{__mkdir_p} ${asset_loc}
-    %{__mv} -vf ${file} ${asset_loc}/$(basename ${file})
+    %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
 done
 
 new_files > core.files
@@ -1521,10 +1928,10 @@
 #cat core.files
 #echo "==========================="
 
-for file in `find %{name}-assets-%{version}/ -type f`; do
-    asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|%{name}-assets-%{version}|%{buildroot}%{datadir}|g"))
+for file in `find %{name}-assets-%{version}%{?dash_rel_suffix}/ -type f`; do
+    asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|%{name}-assets-%{version}%{?dash_rel_suffix}|%{buildroot}%{datadir}|g"))
     %{__mkdir_p} ${asset_loc}
-    %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
+    %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
 done
 
 new_files > core-assets.files
@@ -1537,40 +1944,47 @@
 echo "Dividing Skin Assets and Non-Assets"
 echo "================================================================="
 
-for skin in larry; do
+for skin in elastic larry; do
     # Take the files from the original directory,
     # Find the ones that are assets,
     # Move those over to the assets-specific directory.
 
-    orig_dir="%{name}-skin-${skin}-%{version}"
-    asset_dir="%{name}-skin-${skin}-assets-%{version}$(echo ${asset_path} | %{__sed} -e 's|%{buildroot}%{datadir}||g')"
+    orig_dir="%{name}-skin-${skin}-%{version}%{?dash_rel_suffix}"
+    asset_dir="%{name}-skin-${skin}-assets-%{version}%{?dash_rel_suffix}$(echo ${asset_path} | %{__sed} -e 's|%{buildroot}%{datadir}||g')"
 
     echo "Original directory for the ${skin} skin: ${orig_dir}"
     echo "Asset directory for the ${skin} skin: ${asset_dir}"
 
+    # Compile and compress the CSS
+    for file in `find ${orig_dir} -type f -name "styles.less" -o -name "print.less" -o -name "embed.less"`; do
+        asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
+        %{__mkdir_p} ${asset_loc}
+        %{_bindir}/lessc -x ${file} > ${asset_loc}/$(basename ${file} .less).css
+    done
+    find ${asset_loc} -type f -name "*.css" -empty -delete
+    find ${asset_log} -type d -empty -delete
+
     # Compress the CSS
     for file in `find ${orig_dir} -type f -name "*.css" ! -path "*tests/*"`; do
         asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
         %{__mkdir_p} ${asset_loc}
-        cat ${file} | python %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) && \
-            %{__rm} -rf ${file} || \
-            %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
+        cat ${file} | python %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) || \
+            %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
     done
 
     # Compress the JS, but not the already minified
     for file in `find ${orig_dir} -type f -name "*.js" ! -name "*.min.js"`; do
         asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
         %{__mkdir_p} ${asset_loc}
-        uglifyjs ${file} > ${asset_loc}/$(basename ${file}) && \
-            %{__rm} -rf ${file} || \
-            %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
+        uglifyjs ${file} > ${asset_loc}/$(basename ${file}) || \
+            %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
     done
 
     # The already minified JS can just be copied over to the assets location
     for file in `find ${orig_dir} -type f -name "*.min.js"`; do
         asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
         %{__mkdir_p} ${asset_loc}
-        %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
+        %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
     done
 
     # Other assets
@@ -1589,22 +2003,30 @@
             -name "*.ttf" -o \
             -name "*.wav" -o \
             -name "*.webp" -o \
-            -name "*.woff"
+            -name "*.woff" -o \
+            -name "*.woff2"
         ); do
         asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
         %{__mkdir_p} ${asset_loc}
-        %{__mv} -vf ${file} ${asset_loc}/$(basename ${file})
+        %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
     done
 
     # The watermark.html is an asset, too
     if [ -f "${orig_dir}/skins/${skin}/watermark.html" ]; then
-        %{__mv} -v ${orig_dir}/skins/${skin}/watermark.html \
+        %{__cp} -av ${orig_dir}/skins/${skin}/watermark.html \
             ${asset_dir}/skins/${skin}/watermark.html
     fi
 
-    find %{name}-skin-${skin}-%{version}/skins/ -type d -empty -delete
+    find %{name}-skin-${skin}-%{version}%{?dash_rel_suffix}/skins/ -type d -empty -delete
 
-    cp -a %{name}-skin-${skin}-%{version}/skins/* %{buildroot}%{datadir}/skins/.
+    cp -a %{name}-skin-${skin}-%{version}%{?dash_rel_suffix}/skins/* %{buildroot}%{datadir}/skins/.
+
+    if [ "${skin}" == "elastic" ]; then
+        pushd %{buildroot}%{datadir}/skins/elastic
+        %{__rm} -rvf images
+        ln -s ../../public_html/assets/skins/elastic/images images
+        popd
+    fi
 
     new_files > skin-${skin}.files
 
@@ -1613,7 +2035,7 @@
     #echo "==========================="
 
     %{__mkdir_p} %{buildroot}%{datadir}/public_html/assets/skins/
-    cp -a %{name}-skin-${skin}-assets-%{version}/public_html/assets/skins/* %{buildroot}%{datadir}/public_html/assets/skins/.
+    cp -a %{name}-skin-${skin}-assets-%{version}%{?dash_rel_suffix}/public_html/assets/skins/* %{buildroot}%{datadir}/public_html/assets/skins/.
 
     new_files > skin-${skin}-assets.files
 
@@ -1626,40 +2048,47 @@
 echo "Dividing Plugins, Plugin Assets, Plugin Skins and Plugin Skin Assets and Non-Assets"
 echo "==================================================================================="
 
-for plugin in $(find %{name}-%{version}/plugins/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | sort); do
-    for skin in larry; do
-        orig_dir="%{name}-plugin-${plugin}-skin-${skin}-%{version}"
+for plugin in $(find %{name}-%{version}%{?dash_rel_suffix}/plugins/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | sort); do
+    for skin in elastic larry; do
+        orig_dir="%{name}-plugin-${plugin}-skin-${skin}-%{version}%{?dash_rel_suffix}"
 
         # No skin, no assets
         if [ ! -d "${orig_dir}" ]; then
             continue
         fi
 
-        asset_dir="%{name}-plugin-${plugin}-skin-${skin}-assets-%{version}"
+        asset_dir="%{name}-plugin-${plugin}-skin-${skin}-assets-%{version}%{?dash_rel_suffix}"
+
+        # Compile and compress the CSS
+        for file in `find ${orig_dir} -type f -name "styles.less" -o -name "print.less" -o -name "embed.less" `; do
+            asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
+            %{__mkdir_p} ${asset_loc}
+            %{_bindir}/lessc -x ${file} > ${asset_loc}/$(basename ${file} .less).css
+        done
+        find ${asset_loc} -type f ! -name "*.css" -empty -delete
+        find ${asset_loc} -type d -empty -delete
 
         # Compress the CSS
         for file in `find ${orig_dir} -type f -name "*.css" ! -path "*tests/"`; do
             asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
             %{__mkdir_p} ${asset_loc}
-            cat ${file} | python %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) && \
-                %{__rm} -rf ${file} || \
-                %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
+            cat ${file} | python %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) || \
+                %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
         done
 
         # Compress the JS, but not the already minified
         for file in `find ${orig_dir} -type f -name "*.js" ! -name "*.min.js"`; do
             asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
             %{__mkdir_p} ${asset_loc}
-            uglifyjs ${file} > ${asset_loc}/$(basename ${file}) && \
-                %{__rm} -rf ${file} || \
-                %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
+            uglifyjs ${file} > ${asset_loc}/$(basename ${file}) || \
+                %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
         done
 
         # The already minified JS can just be copied over to the assets location
         for file in `find ${orig_dir} -type f -name "*.min.js"`; do
             asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
             %{__mkdir_p} ${asset_loc}
-            %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
+            %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
         done
 
         # Other assets
@@ -1678,11 +2107,12 @@
                 -name "*.ttf" -o \
                 -name "*.wav" -o \
                 -name "*.webp" -o \
-                -name "*.woff"
+                -name "*.woff" -o \
+                -name "*.woff2"
             ); do
             asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
             %{__mkdir_p} ${asset_loc}
-            %{__mv} -vf ${file} ${asset_loc}/$(basename ${file})
+            %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
         done
 
         # Purge empty directories
@@ -1690,7 +2120,7 @@
     done
 
     %{__mkdir_p} %{buildroot}%{plugindir}
-    cp -a %{name}-plugin-${plugin}-%{version}/plugins/${plugin} %{buildroot}%{plugindir}/.
+    cp -a %{name}-plugin-${plugin}-%{version}%{?dash_rel_suffix}/plugins/${plugin} %{buildroot}%{plugindir}/.
 
     if [ -f "%{buildroot}%{plugindir}/${plugin}/config.inc.php.dist" ]; then
         pushd %{buildroot}%{plugindir}/${plugin}
@@ -1702,8 +2132,9 @@
     if [ "${plugin}" == "enigma" ]; then
         %{__mkdir_p} %{buildroot}%{tmpdir}/plugins/
         pushd %{buildroot}%{plugindir}/${plugin}
-        %{__mv} -v home %{buildroot}%{tmpdir}/plugins/${plugin}
-        ln -s ../../../../..%{tmpdir}/plugins/${plugin} home
+        %{__mv} -v home %{buildroot}%{tmpdir}/plugins/${plugin} || \
+            mkdir -p %{buildroot}%{tmpdir}/plugins/${plugin}
+        ln -sv ../../../../..%{tmpdir}/plugins/${plugin} home
         popd
     fi
 
@@ -1714,32 +2145,39 @@
     #echo "==========================="
 
     # Skin-independent assets
-    orig_dir="%{name}-plugin-${plugin}-%{version}"
-    asset_dir="%{name}-plugin-${plugin}-assets-%{version}"
+    orig_dir="%{name}-plugin-${plugin}-%{version}%{?dash_rel_suffix}"
+    asset_dir="%{name}-plugin-${plugin}-assets-%{version}%{?dash_rel_suffix}"
+
+    # Compile and compress the CSS
+    for file in `find ${orig_dir} -type f -name "styles.less" -o -name "print.less" -o -name "embed.less" `; do
+        asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
+        %{__mkdir_p} ${asset_loc}
+        %{_bindir}/lessc -x ${file} > ${asset_loc}/$(basename ${file} .less).css
+    done
+    find ${asset_loc} -type f -empty -delete
+    find ${asset_loc} -type d -empty -delete
 
     # Compress the CSS
     for file in `find ${orig_dir} -type f -name "*.css" ! -path "*tests/"`; do
         asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
         %{__mkdir_p} ${asset_loc}
-        cat ${file} | python %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) && \
-            %{__rm} -rf ${file} || \
-            %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
+        cat ${file} | python %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) || \
+            %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
     done
 
     # Compress the JS, but not the already minified
     for file in `find ${orig_dir} -type f -name "*.js" ! -name "*.min.js"`; do
         asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
         %{__mkdir_p} ${asset_loc}
-        uglifyjs ${file} > ${asset_loc}/$(basename ${file}) && \
-            %{__rm} -rf ${file} || \
-            %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
+        uglifyjs ${file} > ${asset_loc}/$(basename ${file}) || \
+            %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
     done
 
     # The already minified JS can just be copied over to the assets location
     for file in `find ${orig_dir} -type f -name "*.min.js"`; do
         asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
         %{__mkdir_p} ${asset_loc}
-        %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
+        %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
     done
 
     # Other assets
@@ -1758,74 +2196,65 @@
             -name "*.ttf" -o \
             -name "*.wav" -o \
             -name "*.webp" -o \
-            -name "*.woff"
+            -name "*.woff" -o \
+            -name "*.woff2"
         ); do
         asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
         %{__mkdir_p} ${asset_loc}
-        %{__mv} -vf ${file} ${asset_loc}/$(basename ${file})
+        %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
     done
 
     # Purge empty directories
     find ${orig_dir} -type d -empty -delete
 
-    if [ ! -d ${asset_dir} ]; then
-        %{__mkdir_p} ${asset_dir}
-        touch ${asset_dir}/dummy.js
+%if 0%{?fedora}
+    # Empty packages are not fun with Fedora
+    if [ ! -d ${asset_loc} ]; then
+        %{__mkdir_p} ${asset_loc}
+        echo "/* Nothing here */" > ${asset_loc}/dummy.js
     fi
+%endif
 
     # Install the assets
-    for file in `find %{name}-plugin-${plugin}-assets-%{version} -type f`; do
-        asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|%{name}-plugin-${plugin}-assets-%{version}|$asset_path|g"))
+    for file in `find %{name}-plugin-${plugin}-assets-%{version}%{?dash_rel_suffix} -type f`; do
+        asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|%{name}-plugin-${plugin}-assets-%{version}%{?dash_rel_suffix}|$asset_path|g"))
         %{__mkdir_p} ${asset_loc}
-        %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
+        %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
     done
 
     new_files > plugin-${plugin}-assets.files
-
-    #echo "== Files for plugin ${plugin}: =="
-    #cat plugin-${plugin}-assets.files
-    #echo "==========================="
 done
 
-for plugin in $(find %{name}-%{version}/plugins/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | sort); do
-    for skin in larry; do
+for plugin in $(find %{name}-%{version}%{?dash_rel_suffix}/plugins/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | sort); do
+    for skin in elastic larry; do
         touch plugin-${plugin}-skin-${skin}.files
         touch plugin-${plugin}-skin-${skin}-assets.files
 
-        if [ ! -d "%{name}-plugin-${plugin}-skin-${skin}-%{version}/plugins/${plugin}/skins" ]; then
-            echo "%doc README.md" > plugin-${plugin}-skin-${skin}.files
-            echo "%doc README.md" > plugin-${plugin}-skin-${skin}-assets.files
+        if [ ! -d "%{name}-plugin-${plugin}-skin-${skin}-%{version}%{?dash_rel_suffix}/plugins/${plugin}/skins" ]; then
+            rm -f plugin-${plugin}-skin-${skin}.files
+            rm -f plugin-${plugin}-skin-${skin}-assets.files
             continue
         fi
 
         %{__install} -d %{buildroot}%{plugindir}/${plugin}/skins/
-        cp -a %{name}-plugin-${plugin}-skin-${skin}-%{version}/plugins/${plugin}/skins/${skin} %{buildroot}%{plugindir}/${plugin}/skins/.
+        cp -a %{name}-plugin-${plugin}-skin-${skin}-%{version}%{?dash_rel_suffix}/plugins/${plugin}/skins/${skin} %{buildroot}%{plugindir}/${plugin}/skins/.
 
         new_files > plugin-${plugin}-skin-${skin}.files
         if [ ! -s "plugin-${plugin}-skin-${skin}.files" ]; then
-            echo "%doc README.md" > plugin-${plugin}-skin-${skin}.files
+            rm -f plugin-${plugin}-skin-${skin}.files
         fi
 
-        #echo "== Files for skin ${plugin}-${skin}: =="
-        #cat plugin-${plugin}-skin-${skin}.files
-        #echo "==========================="
-
         # Install the assets
-        for file in `find %{name}-plugin-${plugin}-skin-${skin}-assets-%{version} -type f`; do
-            asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|%{name}-plugin-${plugin}-skin-${skin}-assets-%{version}|$asset_path|g"))
+        for file in `find %{name}-plugin-${plugin}-skin-${skin}-assets-%{version}%{?dash_rel_suffix} -type f`; do
+            asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|%{name}-plugin-${plugin}-skin-${skin}-assets-%{version}%{?dash_rel_suffix}|$asset_path|g"))
             %{__mkdir_p} ${asset_loc}
-            %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
+            %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
         done
 
         new_files > plugin-${plugin}-skin-${skin}-assets.files
         if [ ! -s "plugin-${plugin}-skin-${skin}-assets.files" ]; then
-            echo "%doc README.md" > plugin-${plugin}-skin-${skin}-assets.files
+            rm -f plugin-${plugin}-skin-${skin}-assets.files
         fi
-
-        #echo "== Files for skin ${plugin}-${skin}: =="
-        #cat plugin-${plugin}-skin-${skin}-assets.files
-        #echo "==========================="
-
     done
 done
 
@@ -1845,7 +2274,7 @@
 fi
 
 %check
-pushd %{name}-%{version}/tests
+pushd %{name}-%{version}%{?dash_rel_suffix}/tests
 phpunit --debug || :
 popd
 
@@ -2059,7 +2488,7 @@
 fi
 
 /usr/share/roundcubemail/bin/updatedb.sh \
-    --dir /usr/share/doc/roundcubemail-core-%{version}/SQL/ \
+    --dir /usr/share/doc/roundcubemail-core-%{version}%{?dash_rel_suffix}/SQL/ \
     --package roundcube || : \
     >/dev/null 2>&1
 
@@ -2562,13 +2991,13 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{name}-%{version}/LICENSE
-%doc %{name}-%{version}/UPGRADING
-%doc %{name}-%{version}/SQL
+%doc %{name}-%{version}%{?dash_rel_suffix}/LICENSE
+%doc %{name}-%{version}%{?dash_rel_suffix}/UPGRADING
+%doc %{name}-%{version}%{?dash_rel_suffix}/SQL
 
 %files core -f core.files
 %defattr(-,root,root,-)
-%doc %{name}-%{version}/SQL
+%doc %{name}-%{version}%{?dash_rel_suffix}/SQL
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %if 0%{?suse_version}
 %dir %{_ap_sysconfdir}/
@@ -2621,7 +3050,6 @@
 %files plugin-enigma -f plugin-enigma.files
 %defattr(-,root,root,-)
 %attr(0640,root,%{httpd_group}) %config(noreplace) %{_sysconfdir}/%{name}/enigma.inc.php
-%attr(0750,%{httpd_user},%{httpd_group}) %{tmpdir}/plugins/enigma
 
 %files plugin-example_addressbook -f plugin-example_addressbook.files
 %defattr(-,root,root,-)
@@ -2748,6 +3176,9 @@
 %files plugin-http_authentication-assets -f plugin-http_authentication-assets.files
 %defattr(-,root,root,-)
 
+%files plugin-identicon-assets -f plugin-identicon-assets.files
+%defattr(-,root,root,-)
+
 %files plugin-identity_select-assets -f plugin-identity_select-assets.files
 %defattr(-,root,root,-)
 
@@ -2802,28 +3233,37 @@
 %files plugin-zipdownload-assets -f plugin-zipdownload-assets.files
 %defattr(-,root,root,-)
 
+%files plugin-acl-skin-elastic -f plugin-acl-skin-elastic.files
+%defattr(-,root,root,-)
+
 %files plugin-acl-skin-larry -f plugin-acl-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-archive-skin-larry -f plugin-archive-skin-larry.files
+%files plugin-enigma-skin-elastic -f plugin-enigma-skin-elastic.files
 %defattr(-,root,root,-)
 
 %files plugin-enigma-skin-larry -f plugin-enigma-skin-larry.files
 %defattr(-,root,root,-)
 
+%files plugin-help-skin-elastic -f plugin-help-skin-elastic.files
+%defattr(-,root,root,-)
+
 %files plugin-help-skin-larry -f plugin-help-skin-larry.files
 %defattr(-,root,root,-)
 
 %files plugin-hide_blockquote-skin-larry -f plugin-hide_blockquote-skin-larry.files
 %defattr(-,root,root,-)
 
+%files plugin-jqueryui-skin-elastic -f plugin-jqueryui-skin-elastic.files
+%defattr(-,root,root,-)
+
 %files plugin-jqueryui-skin-larry -f plugin-jqueryui-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-managesieve-skin-larry -f plugin-managesieve-skin-larry.files
+%files plugin-managesieve-skin-elastic -f plugin-managesieve-skin-elastic.files
 %defattr(-,root,root,-)
 
-%files plugin-markasjunk-skin-larry -f plugin-markasjunk-skin-larry.files
+%files plugin-managesieve-skin-larry -f plugin-managesieve-skin-larry.files
 %defattr(-,root,root,-)
 
 %files plugin-vcard_attachments-skin-larry -f plugin-vcard_attachments-skin-larry.files
@@ -2832,28 +3272,37 @@
 %files plugin-zipdownload-skin-larry -f plugin-zipdownload-skin-larry.files
 %defattr(-,root,root,-)
 
+%files plugin-acl-skin-elastic-assets -f plugin-acl-skin-elastic-assets.files
+%defattr(-,root,root,-)
+
 %files plugin-acl-skin-larry-assets -f plugin-acl-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-archive-skin-larry-assets -f plugin-archive-skin-larry-assets.files
+%files plugin-enigma-skin-elastic-assets -f plugin-enigma-skin-elastic-assets.files
 %defattr(-,root,root,-)
 
 %files plugin-enigma-skin-larry-assets -f plugin-enigma-skin-larry-assets.files
 %defattr(-,root,root,-)
 
+%files plugin-help-skin-elastic-assets -f plugin-help-skin-elastic-assets.files
+%defattr(-,root,root,-)
+
 %files plugin-help-skin-larry-assets -f plugin-help-skin-larry-assets.files
 %defattr(-,root,root,-)
 
 %files plugin-hide_blockquote-skin-larry-assets -f plugin-hide_blockquote-skin-larry-assets.files
 %defattr(-,root,root,-)
 
+%files plugin-jqueryui-skin-elastic-assets -f plugin-jqueryui-skin-elastic-assets.files
+%defattr(-,root,root,-)
+
 %files plugin-jqueryui-skin-larry-assets -f plugin-jqueryui-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-managesieve-skin-larry-assets -f plugin-managesieve-skin-larry-assets.files
+%files plugin-managesieve-skin-elastic-assets -f plugin-managesieve-skin-elastic-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-markasjunk-skin-larry-assets -f plugin-markasjunk-skin-larry-assets.files
+%files plugin-managesieve-skin-larry-assets -f plugin-managesieve-skin-larry-assets.files
 %defattr(-,root,root,-)
 
 %files plugin-vcard_attachments-skin-larry-assets -f plugin-vcard_attachments-skin-larry-assets.files
@@ -2862,22 +3311,62 @@
 %files plugin-zipdownload-skin-larry-assets -f plugin-zipdownload-skin-larry-assets.files
 %defattr(-,root,root,-)
 
+%files skin-elastic -f skin-elastic.files
+%defattr(-,root,root,-)
+
 %files skin-larry -f skin-larry.files
 %defattr(-,root,root,-)
 
+%files skin-elastic-assets -f skin-elastic-assets.files
+%defattr(-,root,root,-)
+
 %files skin-larry-assets -f skin-larry-assets.files
 %defattr(-,root,root,-)
 
 %changelog
-* Mon May 28 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.3.6-4
-- By default, do not check the server certificate nor its host name
+* Tue Sep 18 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-49.beta36
+- Check in 36 revisions ahead of beta release
+- Conditionally include collabora.inc.php per vhost on Plesk
+
+* Mon Aug 27 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-47.beta3
+- Promote to beta (3 fixes ahead of upstream)
+
+* Sat Aug 18 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-39.alpha8
+- New snapshot
+- Set create_default_folders to true on Plesk
+
+* Thu Jul 12 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-38.alpha7
+- Fix unread icon
+- Use bold font for folders with unread messages
+- New skin thumbnail image
+- Fix search scope selection
+
+* Tue Jun  5 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-36.alpha6
+- Fix toolbars in Safari desktop browser (T110373)
+
+* Thu May 31 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-34.alpha6
+- Check in pre-alpha 1.4 release with Elastic skin
+
+* Tue May 22 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-32.alpha5
+- Check in pre-alpha 1.4 release with Elastic skin
+
+* Tue May 15 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-31.alpha4
+- Check in pre-alpha 1.4 release with Elastic skin
+
+* Mon May 14 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-16.alpha4
+- Check in pre-alpha 1.4 release with Elastic skin
+
+* Fri May  4 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-13.alpha3
+- Check in pre-alpha 1.4 release with Elastic skin
+
+* Mon Apr 30 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-12.alpha2
+- Check in pre-alpha 1.4 release with Elastic skin
 
-* Mon May 14 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.3.6-3
-- Enable vacation plugin for Plesk installations
-- Patch issues fixed upstream
+* Wed Apr 25 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-9.alpha1
+- Check in pre-alpha 1.4 release with Elastic skin
 
-* Thu Apr 12 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.3.6-1
-- Check in 1.3.6 release
+* Tue Apr 10 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-8.alpha0
+- Check in pre-alpha 1.4 release with Elastic skin
 
 * Thu Apr  5 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.3.5-1
 - Check in 4 revisions ahead of 1.3.5 release

0002-Parse-all-quotas-from-GETQUOTAROOT-6280.patch Deleted

@@ -1,28 +0,0 @@
-From 7dfbb62b78e3949daa8e49db9ebed46ddd8f964e Mon Sep 17 00:00:00 2001
-From: Edgaras L <edgaras.lukosevicius@gmail.com>
-Date: Sat, 5 May 2018 13:48:15 +0300
-Subject: [PATCH 2/5] Parse all quotas from GETQUOTAROOT (#6280)
-
----
- program/lib/Roundcube/rcube_imap_generic.php | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
-index 3899b235e..61564bb1a 100644
---- a/program/lib/Roundcube/rcube_imap_generic.php
-+++ b/program/lib/Roundcube/rcube_imap_generic.php
-@@ -3125,8 +3125,9 @@ class rcube_imap_generic
-                 if (preg_match('/^\* QUOTA /', $line)) {
-                     list(, , $quota_root) = $this->tokenizeResponse($line, 3);
- 
--                    while ($line) {
--                        list($type, $used, $total) = $this->tokenizeResponse($line, 1);
-+                    $quotas = $this->tokenizeResponse($line, 1);
-+                    foreach (array_chunk($quotas, 3) as $quota) {
-+                        list($type, $used, $total) = $quota;
-                         $type = strtolower($type);
- 
-                         if ($type && $total) {
--- 
-2.14.3
-

0003-Update-changelog.patch Deleted

0004-Fix-bug-where-some-escape-sequences-in-html-styles-c.patch Deleted

@@ -1,106 +0,0 @@
-From d9eed3625bf06cd2946b0efb6d88ff9986ba4864 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Sat, 5 May 2018 17:12:18 +0200
-Subject: [PATCH 4/5] Fix bug where some escape sequences in html styles could
- bypass security checks
-
----
- CHANGELOG                               | 3 ++-
- program/lib/Roundcube/rcube_utils.php   | 3 ++-
- program/lib/Roundcube/rcube_washtml.php | 5 ++++-
- tests/Framework/Utils.php               | 8 +++++++-
- tests/MailFunc.php                      | 2 +-
- 5 files changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 729b4b363..21eedff5b 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -2,7 +2,8 @@ CHANGELOG Roundcube Webmail
- ===========================
- 
- - Fix PHP Warning: Use of undefined constant IDNA_DEFAULT on systems without php-intl (#6244)
--- Fix bug where some parts of quota information could be ignored (#6280)
-+- Fix bug where some parts of quota information could have been ignored (#6280)
-+- Fix bug where some escape sequences in html styles could bypass security checks
- 
- RELEASE 1.3.6
- -------------
-diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
-index 77b084a99..03de534f4 100644
---- a/program/lib/Roundcube/rcube_utils.php
-+++ b/program/lib/Roundcube/rcube_utils.php
-@@ -500,7 +500,8 @@ class rcube_utils
- 
-         $out = html_entity_decode(html_entity_decode($content));
-         $out = trim(preg_replace('/(^$)/', '', trim($out)));
--        $out = preg_replace_callback('/\\\([0-9a-f]{2,4})\s*/i', $callback, $out);
-+        $out = preg_replace_callback('/\\\([0-9a-f]{2,6})\s*/i', $callback, $out);
-+        $out = preg_replace('/\\\([^0-9a-f])/i', '\\1', $out);
-         $out = preg_replace('#/\*.*\*/#Ums', '', $out);
-         $out = strip_tags($out);
- 
-diff --git a/program/lib/Roundcube/rcube_washtml.php b/program/lib/Roundcube/rcube_washtml.php
-index ac1af74ef..44173f0b0 100644
---- a/program/lib/Roundcube/rcube_washtml.php
-+++ b/program/lib/Roundcube/rcube_washtml.php
-@@ -242,8 +242,11 @@ class rcube_washtml
-         // Remove unwanted white-space characters so regular expressions below work better
-         $style = preg_replace('/[\n\r\s\t]+/', ' ', $style);
- 
-+        // Decode insecure character sequences
-+        $style = rcube_utils::xss_entity_decode($style);
-+
-         foreach (explode(';', $style) as $declaration) {
--            if (preg_match('/^\s*([a-z\-]+)\s*:\s*(.*)\s*$/i', $declaration, $match)) {
-+            if (preg_match('/^\s*([a-z\\\-]+)\s*:\s*(.*)\s*$/i', $declaration, $match)) {
-                 $cssid = $match[1];
-                 $str   = $match[2];
-                 $value = '';
-diff --git a/tests/Framework/Utils.php b/tests/Framework/Utils.php
-index dc28907be..8543fe991 100644
---- a/tests/Framework/Utils.php
-+++ b/tests/Framework/Utils.php
-@@ -203,12 +203,15 @@ class Framework_Utils extends PHPUnit_Framework_TestCase
-         $mod = rcube_utils::mod_css_styles("left:exp/*  */ression( alert(&#039;xss3&#039;) )", 'rcmbody');
-         $this->assertEquals("/* evil! */", $mod, "Don't allow encoding quirks");
- 
--        $mod = rcube_utils::mod_css_styles("background:\\0075\\0072\\006c( javascript:alert(&#039;xss&#039;) )", 'rcmbody');
-+        $mod = rcube_utils::mod_css_styles("background:\\0075\\0072\\00006c( javascript:alert(&#039;xss&#039;) )", 'rcmbody');
-         $this->assertEquals("/* evil! */", $mod, "Don't allow encoding quirks (2)");
- 
-         $mod = rcube_utils::mod_css_styles("background: \\75 \\72 \\6C ('/images/img.png')", 'rcmbody');
-         $this->assertEquals("/* evil! */", $mod, "Don't allow encoding quirks (3)");
- 
-+        $mod = rcube_utils::mod_css_styles("background: u\\r\\l('/images/img.png')", 'rcmbody');
-+        $this->assertEquals("/* evil! */", $mod, "Don't allow encoding quirks (4)");
-+
-         // position: fixed (#5264)
-         $mod = rcube_utils::mod_css_styles(".test { position: fixed; }", 'rcmbody');
-         $this->assertEquals("#rcmbody .test { position: absolute; }", $mod, "Replace position:fixed with position:absolute (0)");
-@@ -234,6 +237,9 @@ class Framework_Utils extends PHPUnit_Framework_TestCase
-         $mod = rcube_utils::xss_entity_decode('#foo:after{content:"\003Cimg/src=x onerror=alert(2)>";}');
-         $this->assertNotContains('<img', $mod, "Strip (encoded) tags from content property");
- 
-+        $mod = rcube_utils::xss_entity_decode("background: u\\r\\00006c('/images/img.png')");
-+        $this->assertContains("url(", $mod, "Escape sequences resolving");
-+
-         // #5747
-         $mod = rcube_utils::xss_entity_decode('');
-         $this->assertContains('#foo', $mod, "Strip HTML comments from content, but not the content");
-diff --git a/tests/MailFunc.php b/tests/MailFunc.php
-index 69b8a3517..bccdb5f2a 100644
---- a/tests/MailFunc.php
-+++ b/tests/MailFunc.php
-@@ -215,7 +215,7 @@ class MailFunc extends PHPUnit_Framework_TestCase
-       $body = rcmail_print_body($html, $this->get_html_part(), array('safe' => false, 'plain' => false));
- 
-       $this->assertNotContains('onerror=alert(1)//">test', $body);
--      $this->assertContains('<a style="x: &gt;&lt;img src=x onerror=alert(1)//"', $body);
-+      $this->assertContains('<a style="x: &gt;"', $body);
-     }
- 
-     /**
--- 
-2.14.3
-

0005-Fix-bug-where-some-forbidden-characters-on-Cyrus-IMA.patch Deleted

@@ -1,122 +0,0 @@
-From 16b5a345e0000c1909f5a7bcb309f083cae50878 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <machniak@kolabsys.com>
-Date: Tue, 8 May 2018 12:20:11 +0200
-Subject: [PATCH 5/5] Fix bug where some forbidden characters on Cyrus-IMAP
- were not prevented from use in folder names
-
-Conflicts:
-	plugins/archive/archive.php
----
- CHANGELOG                               |  1 +
- program/lib/Roundcube/rcube_imap.php    | 29 +++++++++++++++++++++++++++++
- program/lib/Roundcube/rcube_storage.php | 20 ++++++++++++++++++++
- program/steps/settings/save_folder.inc  | 10 ++--------
- 4 files changed, 52 insertions(+), 8 deletions(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 21eedff5b..6cbd10164 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -4,6 +4,7 @@ CHANGELOG Roundcube Webmail
- - Fix PHP Warning: Use of undefined constant IDNA_DEFAULT on systems without php-intl (#6244)
- - Fix bug where some parts of quota information could have been ignored (#6280)
- - Fix bug where some escape sequences in html styles could bypass security checks
-+- Fix bug where some forbidden characters on Cyrus-IMAP were not prevented from use in folder names
- 
- RELEASE 1.3.6
- -------------
-diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
-index be359d066..eaae624c8 100644
---- a/program/lib/Roundcube/rcube_imap.php
-+++ b/program/lib/Roundcube/rcube_imap.php
-@@ -3722,6 +3722,35 @@ class rcube_imap extends rcube_storage
-         }
-     }
- 
-+    /**
-+     * Check if the folder name is valid
-+     *
-+     * @param string $folder Folder name (UTF-8)
-+     * @param string &$char  First forbidden character found
-+     *
-+     * @return bool True if the name is valid, False otherwise
-+     */
-+    public function folder_validate($folder, &$char = null)
-+    {
-+        if (parent::folder_validate($folder, $char)) {
-+            $vendor = $this->get_vendor();
-+            $regexp = '\\x00-\\x1F\\x7F%*';
-+
-+            if ($vendor == 'cyrus') {
-+                // List based on testing Kolab's Cyrus-IMAP 2.5
-+                $regexp .= '!`@(){}|\\?<;"';
-+            }
-+
-+            if (!preg_match("/[$regexp]/", $folder, $m)) {
-+                return true;
-+            }
-+
-+            $char = $m[0];
-+        }
-+
-+        return false;
-+    }
-+
-     /**
-      * Get message header names for rcube_imap_generic::fetchHeader(s)
-      *
-diff --git a/program/lib/Roundcube/rcube_storage.php b/program/lib/Roundcube/rcube_storage.php
-index 56703177c..faacd4f65 100644
---- a/program/lib/Roundcube/rcube_storage.php
-+++ b/program/lib/Roundcube/rcube_storage.php
-@@ -796,6 +796,26 @@ abstract class rcube_storage
-      */
-     abstract function mod_folder($folder, $mode = 'out');
- 
-+    /**
-+     * Check if the folder name is valid
-+     *
-+     * @param string $folder Folder name (UTF-8)
-+     * @param string &$char  First forbidden character found
-+     *
-+     * @return bool True if the name is valid, False otherwise
-+     */
-+    public function folder_validate($folder, &$char = null)
-+    {
-+        $delim = $this->get_hierarchy_delimiter();
-+
-+        if (strpos($folder, $delim) !== false) {
-+            $char = $delim;
-+            return false;
-+        }
-+
-+        return true;
-+    }
-+
-     /**
-      * Create all folders specified as default
-      */
-diff --git a/program/steps/settings/save_folder.inc b/program/steps/settings/save_folder.inc
-index ed1b09fc1..0b777798b 100644
---- a/program/steps/settings/save_folder.inc
-+++ b/program/steps/settings/save_folder.inc
-@@ -45,14 +45,8 @@ else if (mb_strlen($name) > 128) {
- else if ($name[0] == '.' && $RCMAIL->config->get('imap_skip_hidden_folders')) {
-     $error = $RCMAIL->gettext('namedotforbidden');
- }
--else {
--    // these characters are problematic e.g. when used in LIST/LSUB
--    foreach (array($delimiter, '%', '*') as $char) {
--        if (strpos($name, $char) !== false) {
--            $error = $RCMAIL->gettext('forbiddencharacter') . " ($char)";
--            break;
--        }
--    }
-+else if (!$STORAGE->folder_validate($name, $char)) {
-+    $error = $RCMAIL->gettext('forbiddencharacter') . " ($char)";
- }
- 
- if ($error) {
--- 
-2.14.3
-

roundcubemail-1.3.6-plugin-enigma-homedir.patch Deleted

debian.changelog Changed

@@ -1,21 +1,79 @@
-roundcubemail (1.3.6-0~kolab4) unstable; urgency=low
+roundcubemail (1.4-0~kolab50) unstable; urgency=low
 
-  * By default, do not verify the server certificate nor the host name
+  * Require -skin-plesk on Plesk, -skin-chameleon on community, -kolab or -enterprise on Enterprise
 
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 28 May 2018 11:11:11 +0200
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon,  1 Oct 2018 11:11:11 +0200
 
-roundcubemail (1.3.6-0~kolab3) unstable; urgency=low
+roundcubemail (1.4-0~kolab49) unstable; urgency=low
 
-  * Patch issues fixed upstream
-  * Enable vacation plugin for Plesk installations
+  * Check in 36 revisions ahead of beta release
+  * Conditionally include collabora.inc.php per vhost on Plesk
 
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 14 May 2018 11:11:11 +0200
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 18 Sep 2018 11:11:11 +0200
 
-roundcubemail (1.3.6-0~kolab1) unstable; urgency=low
+roundcubemail (1.4-0~kolab48) unstable; urgency=low
 
-  * Check in 1.3.6 release
+  * Conditionally include mattermost.inc.php per vhost on Plesk
 
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 12 Apr 2018 11:11:11 +0200
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  5 Sep 2018 11:11:11 +0200
+
+roundcubemail (1.4-0~kolab47) unstable; urgency=low
+
+  * 3 fixes ahead of beta release
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 27 Aug 2018 11:11:11 +0200
+
+roundcubemail (1.4-0~kolab39) unstable; urgency=low
+
+  * New snapshot
+  * Set create_default_folders on Plesk
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sat, 18 Aug 2018 11:11:11 +0200
+
+roundcubemail (1.4-0~kolab38) unstable; urgency=low
+
+  * Fix unread icon
+  * Use bold font for folders with unread messages
+  * New thumbnail image for Elastic skin
+  * Fix search scope
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 12 Jul 2018 11:11:11 +0200
+
+roundcubemail (1.4-0~kolab12) unstable; urgency=low
+
+  * Fix toolbars in Safari desktop browser (T110373)
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue,  5 Jun 2018 11:11:11 +0200
+
+roundcubemail (1.4-0~kolab9) unstable; urgency=low
+
+  * Check in a very early release of 1.4 alpha
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 31 May 2018 11:11:11 +0200
+
+roundcubemail (1.4-0~kolab6) unstable; urgency=low
+
+  * Check in a very early release of 1.4 alpha
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 29 May 2018 11:11:11 +0200
+
+roundcubemail (1.4-0~kolab4) unstable; urgency=low
+
+  * Check in a very early release of 1.4 alpha
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 22 May 2018 11:11:11 +0200
+
+roundcubemail (1.4-0~kolab2) unstable; urgency=low
+
+  * Check in a very early release of 1.4 alpha
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 15 May 2018 11:11:11 +0200
+
+roundcubemail (1.4-0~kolab1) unstable; urgency=low
+
+  * Check in a very early release of 1.4 alpha
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon,  9 Apr 2018 11:11:11 +0200
 
 roundcubemail (1.3.5-0~kolab1) unstable; urgency=low

debian.control Changed

debian.rules Changed

@@ -6,6 +6,9 @@
 	dh $@
 
 override_dh_auto_build:
+	echo $(CURDIR)
+	find debian/ -type f | sort
+
 	mkdir -p $(CURDIR)/debian/home/.composer/
 	echo '{}' > $(CURDIR)/debian/home/.composer/composer.json
 	patch -p1 < debian/patches/add-composer-autoloader.diff || :
@@ -21,8 +24,13 @@
 
 	rm -rvf temp/js_cache/ tests/
 
+	# Parse .less
+	lessc -x ./skins/elastic/styles/styles.less > ./skins/elastic/styles/styles.css
+	lessc -x ./skins/elastic/styles/print.less > ./skins/elastic/styles/print.css
+	lessc -x ./skins/elastic/styles/embed.less > ./skins/elastic/styles/embed.css
+
 	# Compress the CSS
-	for file in `find $(CURDIR) -type f -name "*.css"`; do \
+	for file in `find $(CURDIR)/ -type f -name "*.css" | grep -v /public_html/assets/`; do \
 		asset_loc=$$(dirname $$(echo $${file} | sed \
 				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
 				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
@@ -35,7 +43,7 @@
 	done
 
 	# Compress the JS, but not the already minified
-	for file in `find $(CURDIR)/ -type f -name "*.js" ! -name "*.min.js"`; do \
+	for file in `find $(CURDIR)/ -type f -name "*.js" ! -name "*.min.js" | grep -v /public_html/assets/`; do \
 		asset_loc=$$(dirname $$(echo $${file} | sed \
 				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
 				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
@@ -48,7 +56,7 @@
 	done
 
 	# The already minied JS can just be copied over to the assets location
-	for file in `find $(CURDIR)/ -type f -name "*.min.js"`; do \
+	for file in `find $(CURDIR)/ -type f -name "*.min.js" | grep -v /public_html/assets/`; do \
 		asset_loc=$$(dirname $$(echo $${file} | sed \
 				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
 				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
@@ -74,7 +82,8 @@
 			-name "*.ttf" -o \
 			-name "*.wav" -o \
 			-name "*.webp" -o \
-			-name "*.woff" \
+			-name "*.woff" -o \
+			-name "*.woff2" \
 		); do \
 		asset_loc=$$(dirname $$(echo $${file} | sed \
 				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
@@ -82,11 +91,14 @@
 				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
 			) ; \
 		mkdir -p $${asset_loc} ; \
-		mv -vf $${file} $${asset_loc}/$$(basename $${file}); \
+		cp -avf $${file} $${asset_loc}/$$(basename $${file}); \
 	done
 
-	for plugin in `find $(CURDIR)/plugins/ -type d -mindepth 1 -maxdepth 1 -exec basename {} \;)`; do \
+	for plugin in `find $(CURDIR)/plugins/ -type d -mindepth 1 -maxdepth 1 -exec basename {} \;) | sort -u`; do \
 		pkgname=$$(echo $${plugin} | sed -e 's/_/-/g') ; \
+		if [ -f "$(CURDIR)/debian/roundcubemail-plugin-$${pkgname}.install" ]; then \
+			continue ; \
+		fi ; \
 		if [ -f "$(CURDIR)/plugins/$${plugin}/config.inc.php.dist" ]; then \
 			mv $(CURDIR)/plugins/$${plugin}/config.inc.php.dist $(CURDIR)/config/$${plugin}.inc.php ; \
 			echo "etc/roundcubemail/$${plugin}.inc.php usr/share/roundcubemail/plugins/$${plugin}/config.inc.php" >> debian/roundcubemail-plugin-$${pkgname}.links ; \
@@ -120,12 +132,15 @@
 		cp -v ../SOURCES/plesk.managesieve.inc.php config/managesieve.inc.php ; \
 		cp -v ../SOURCES/plesk.password.inc.php config/password.inc.php ; \
 		sed -i -e 's/www-data adm/roundcube_sysuser roundcube_sysgroup/g' debian/logrotate ; \
+		echo "misc:Depends:roundcubemail-skin-plesk" >> debian/roundcubemail-core.substvars ; \
 	else \
-		mv config/config.inc.php.sample config/config.inc.php ; \
+		find config/ -type f | sort ; \
+		if [ -f "config/config.inc.php.sample" ]; then \
+			mv config/config.inc.php.sample config/config.inc.php ; \
+		fi ; \
+		echo "misc:Depends:roundcubemail-skin-chameleon | roundcubemail-skin-kolab | roundcubemail-skin-enterprise" >> debian/roundcubemail-core.substvars ; \
 	fi
 
-	dh_auto_build
-
 override_dh_install:
 	if [ ! -f "/etc/plesk-release" ]; then \
 		mkdir -p $(CURDIR)/debian/roundcubemail-core/etc/apache2/sites-available ; \

debian.series Changed

plesk.config.inc.php Changed

@@ -14,12 +14,12 @@
 */
     $config['support_url'] = "https://www.plesk.com/support/";
 
-    $config['product_name'] = "Plesk Premium Email, powered by Kolab";
+    $config['product_name'] = "Plesk Premium Mail, powered by Kolab";
 
-    $config['default_host'] = "ssl://localhost";
-    $config['default_port'] = 9993;
+    $config['default_host'] = "localhost";
+    $config['default_port'] = 143;
 
-    $config['smtp_server'] = "tls://localhost";
+    $config['smtp_server'] = "localhost";
     $config['smtp_port'] = 25;
     $config['smtp_user'] = '%u';
     $config['smtp_pass'] = '%p';
@@ -140,11 +140,16 @@
 
     $config['performance_stats'] = true;
 
+    $config['archive_mbox'] = 'Archive';
     $config['drafts_mbox'] = 'Drafts';
     $config['junk_mbox'] = 'Spam';
     $config['sent_mbox'] = 'Sent';
     $config['trash_mbox'] = 'Trash';
 
+    $config['create_default_folders'] = true;
+
+    $config['default_folders'] = array('INBOX', 'Archive', 'Drafts', 'Sent', 'Spam', 'Trash');
+
     $config['skin_include_php'] = false;
     $config['mime_magic'] = null;
     $config['im_identify_path'] = '/usr/bin/identify';
@@ -152,10 +157,6 @@
     $config['log_dir'] = 'logs/';
     $config['temp_dir'] = '/tmp';
 
-    $config['archive_mbox'] = 'Archive';
-    $config['junk_mbox'] = 'Spam';
-    $config['default_folders'] = array('INBOX', 'Archive', 'Drafts', 'Sent', 'Spam', 'Trash');
-
     $config['log_driver'] = 'file';
     $config['log_date_format'] = 'Y-M-d H:i:s O';
     $config['syslog_id'] = 'roundcube';
@@ -190,11 +191,21 @@
         )
     );
 
-    // Discretionary user-supplied overrides
     if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/'. basename(__FILE__))) {
         @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/'. basename(__FILE__));
     }
 
+    // Integration between Plesk Premium Email and Collabora Online extensions
+    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/collabora.inc.php')) {
+        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/collabora.inc.php');
+    }
+
+    // Integration between Plesk Premium Email and Mattermost extensions
+    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/mattermost.inc.php')) {
+        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/mattermost.inc.php');
+    }
+
+    // Integration between Plesk Premium Email and Seafile extensions
     if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/seafile.inc.php')) {
         @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/seafile.inc.php');
     }

plesk.managesieve.inc.php Changed

roundcubemail-1.3.6.tar.gz Deleted

roundcubemail-1.4-beta36.tar.gz Added

roundcubemail.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2309 0

Request History

vanmeeuwen created request over 6 years ago

Update roundcube

vanmeeuwen accepted review over 6 years ago

vanmeeuwen accepted request over 6 years ago