Request 2162 (superseded)

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

This request is superseded by request 2176 (Show diff)

Overview

Request 2162 (superseded)

Check in release 3.3.5

Created by vanmeeuwen over 6 years ago
In state superseded
Superseded by 2176
Open review for Admin
Open review for vanmeeuwen

Submit roundcubemail-plugins-kolab

Submit package Kolab:Winterfell / roundcubema...gins-kolab to package Kolab:16 / roundcubemail-plugins-kolab

roundcubemail-plugins-kolab.spec Changed

@@ -1,10 +1,3 @@
-%if 0%{?opensuse_bs}
-#!BuildIgnore: lighttpd
-#!BuildIgnore: nginx
-%endif
-
-%global bootstrap 0
-
 %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
 
 %if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
@@ -29,22 +22,15 @@
 %endif
 %endif
 
-%global roundcube_version 1.4
+%global roundcube_version 1.2
 %global datadir %{_datadir}/roundcubemail
 %global plugindir %{datadir}/plugins
 %global confdir %{_sysconfdir}/roundcubemail
 %global tmpdir %{_var}/lib/roundcubemail
 
-%global rc_version 3.5.9
-#%%global rc_rel_suffix beta1
-%global dot_rel_suffix %{?rc_rel_suffix:.%{rc_rel_suffix}}
-%global dash_rel_suffix %{?rc_rel_suffix:-%{rc_rel_suffix}}
-
 Name:           roundcubemail-plugins-kolab
-Version:        3.5.11
-
-Release:        1%{?dot_rel_suffix}%{?dist}
-
+Version:        3.3.5
+Release:        1%{?dist}
 Summary:        Kolab Groupware plugins for Roundcube Webmail
 
 Group:          Applications/Internet
@@ -52,16 +38,15 @@
 URL:            http://www.kolab.org
 
 # From 562ed98bd2e265c0d8a12bd2092b72d85d3e3543
-Source0:        https://mirror.kolabenterprise.com/pub/releases/roundcubemail-plugins-kolab-%{version}%{?dash_rel_suffix}.tar.gz
+Source0:        https://mirror.kolabenterprise.com/pub/releases/roundcubemail-plugins-kolab-%{version}.tar.gz
 Source1:        comm.py
 
 Source100:      plesk.calendar.inc.php
 Source101:      plesk.kolab_addressbook.inc.php
-Source102:      plesk.kolab_chat.inc.php
-Source103:      plesk.kolab_folders.inc.php
-Source104:      plesk.libkolab.inc.php
+Source102:      plesk.kolab_folders.inc.php
+Source103:      plesk.libkolab.inc.php
 
-Patch0000:      roundcubemail-plugins-kolab-3.4-kolab-files-manticore-api.patch
+Patch1001:      roundcubemail-plugins-kolab-3.3-kolab-files-manticore-api.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
@@ -74,24 +59,20 @@
 BuildRequires:  php-justinrainbow-json-schema4
 %endif
 
-%if "%{_arch}" != "ppc64" && "%{_arch}" != "ppc64le"
-BuildRequires:  nodejs-less
-%if 0%{?suse_version} < 1
+%if "%{_arch}" != "ppc64" && "%{_arch}" != "ppc64le" && 0%{?suse_version} < 1
 BuildRequires:  python-cssmin
 BuildRequires:  uglify-js
-%endif
 %else
-BuildRequires:  php-lessphp
+BuildRequires:  roundcubemail(core)
 %endif
 
 BuildRequires:  python
-BuildRequires:  roundcubemail(skin-elastic)
 
-Requires:       php-bindings(libkolab) >= 2.0
-Requires:       php-bindings(libkolabxml) >= 1.2
+Requires:       php-kolabformat >= 1.0
+Requires:       php-kolab >= 0.5
 Requires:       php-pear(HTTP_Request2)
 %if 0%{?plesk} < 1
-Requires:       php-kolab-net-ldap3
+Requires:       php-pear(Net_LDAP3)
 %endif
 Requires:       php-pear(Mail_Mime) >= 1.8.5
 Requires:       roundcubemail >= %{roundcube_version}
@@ -119,29 +100,14 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-calendar-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-Requires:       roundcubemail(plugin-calendar-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-plesk) >= 0.4
+%if 0%{?fedora} >= 25
+# avoid that plugin-calendar-skin-classic is installed, which is not what we want. that would return an error when loading the calendar
+Requires:       roundcubemail(plugin-calendar-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 %else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       roundcubemail(skin-enterprise) >= 0.3.7
-Requires:       roundcubemail(skin-kolab) >= 0.4
-Requires:       roundcubemail(plugin-calendar-skin-larry) >= %{roundcube_version}
-%endif
-Requires:       roundcubemail-plugin-calendar-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-calendar-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-calendar-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-calendar-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       roundcubemail(skin-chameleon) >= 0.3.9
-Requires:       roundcubemail(plugin-calendar-skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-calendar-skin-larry) >= %{roundcube_version}
-%endif
+Requires:       roundcubemail(plugin-calendar-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 Requires:       roundcubemail(plugin-libcalendaring) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-calendar) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-calendar
@@ -152,10 +118,7 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-html_converter-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-html_converter-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-html_converter-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-html_converter-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-html_converter-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       roundcubemail(plugin-html_converter-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       lynx
 Provides:       roundcubemail(plugin-html_converter) = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -167,26 +130,7 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-kolab_2fa-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-Requires:       roundcubemail(plugin-kolab_2fa-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-plesk) >= 0.4
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       roundcubemail(skin-enterprise) >= 0.3.7
-Requires:       roundcubemail(skin-kolab) >= 0.4
-Requires:       roundcubemail(plugin-kolab_2fa-skin-larry) >= %{roundcube_version}
-%endif
-Requires:       roundcubemail-plugin-kolab_2fa-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_2fa-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_2fa-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_2fa-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       roundcubemail(skin-chameleon) >= 0.3.9
-Requires:       roundcubemail(plugin-kolab_2fa-skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_2fa-skin-larry) >= %{roundcube_version}
-%endif
-%endif
+Requires:       roundcubemail(plugin-kolab_2fa-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       php-endroid-qrcode
 Requires:       php-enygma-yubikey
 Requires:       php-spomky-labs-otphp
@@ -200,26 +144,7 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-kolab_activesync-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-Requires:       roundcubemail(plugin-kolab_activesync-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-plesk) >= 0.4
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       roundcubemail(skin-enterprise) >= 0.3.7
-Requires:       roundcubemail(skin-kolab) >= 0.4
-Requires:       roundcubemail(plugin-kolab_activesync-skin-larry) >= %{roundcube_version}
-%endif
-Requires:       roundcubemail-plugin-kolab_activesync-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_activesync-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_activesync-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_activesync-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       roundcubemail(skin-chameleon) >= 0.3.9
-Requires:       roundcubemail(plugin-kolab_activesync-skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_activesync-skin-larry) >= %{roundcube_version}
-%endif
-%endif
+Requires:       roundcubemail(plugin-kolab_activesync-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       roundcubemail(plugin-jqueryui) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-kolab_activesync) = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -232,26 +157,7 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-kolab_addressbook-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-Requires:       roundcubemail(plugin-kolab_addressbook-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-plesk) >= 0.4
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       roundcubemail(skin-enterprise) >= 0.3.7
-Requires:       roundcubemail(skin-kolab) >= 0.4
-Requires:       roundcubemail(plugin-kolab_addressbook-skin-larry) >= %{roundcube_version}
-%endif
-Requires:       roundcubemail-plugin-kolab_addressbook-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_addressbook-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_addressbook-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_addressbook-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       roundcubemail(skin-chameleon) >= 0.3.9
-Requires:       roundcubemail(plugin-kolab_addressbook-skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_addressbook-skin-larry) >= %{roundcube_version}
-%endif
-%endif
+Requires:       roundcubemail(plugin-kolab_addressbook-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-kolab_addressbook) = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -263,68 +169,16 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-kolab_auth-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_auth-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_auth-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_auth-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_auth-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-kolab_auth) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-kolab_auth
 Plugin kolab_auth
 
-%package -n roundcubemail-plugin-kolab_auth_proxy
-Summary:        Plugin kolab_auth_proxy
-Group:          Applications/Internet
-Requires:       roundcubemail(core) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_auth_proxy-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_auth_proxy-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_auth_proxy-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_auth_proxy-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_auth_proxy-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_auth_proxy) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_auth_proxy
-Plugin kolab_auth_proxy
-
-%package -n roundcubemail-plugin-kolab_chat
-Summary:        Plugin kolab_chat
-Group:          Applications/Internet
-Requires:       roundcubemail(core) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_chat-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-Requires:       roundcubemail(plugin-kolab_chat-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-plesk) >= 0.4
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       roundcubemail(skin-enterprise) >= 0.3.7
-Requires:       roundcubemail(skin-kolab) >= 0.4
-Requires:       roundcubemail(plugin-kolab_chat-skin-larry) >= %{roundcube_version}
-%endif
-Requires:       roundcubemail-plugin-kolab_chat-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_chat-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_chat-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_chat-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       roundcubemail(skin-chameleon) >= 0.3.9
-Requires:       roundcubemail(plugin-kolab_chat-skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_chat-skin-larry) >= %{roundcube_version}
-%endif
-%endif
-Provides:       roundcubemail(plugin-kolab_chat) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_chat
-Plugin kolab_chat
-
 %package -n roundcubemail-plugin-kolab_config
 Summary:        Plugin kolab_config
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-kolab_config-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_config-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_config-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_config-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_config-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-kolab_config) = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -336,26 +190,7 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-kolab_delegation-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-Requires:       roundcubemail(plugin-kolab_delegation-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-plesk) >= 0.4
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       roundcubemail(skin-enterprise) >= 0.3.7
-Requires:       roundcubemail(skin-kolab) >= 0.4
-Requires:       roundcubemail(plugin-kolab_delegation-skin-larry) >= %{roundcube_version}
-%endif
-Requires:       roundcubemail-plugin-kolab_delegation-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_delegation-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_delegation-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_delegation-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       roundcubemail(skin-chameleon) >= 0.3.9
-Requires:       roundcubemail(plugin-kolab_delegation-skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_delegation-skin-larry) >= %{roundcube_version}
-%endif
-%endif
+Requires:       roundcubemail(plugin-kolab_delegation-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       roundcubemail(plugin-kolab_auth) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-kolab_delegation) = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -368,26 +203,7 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-kolab_files-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-Requires:       roundcubemail(plugin-kolab_files-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-plesk) >= 0.4
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       roundcubemail(skin-enterprise) >= 0.3.7
-Requires:       roundcubemail(skin-kolab) >= 0.4
-Requires:       roundcubemail(plugin-kolab_files-skin-larry) >= %{roundcube_version}
-%endif
-Requires:       roundcubemail-plugin-kolab_files-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_files-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_files-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_files-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       roundcubemail(skin-chameleon) >= 0.3.9
-Requires:       roundcubemail(plugin-kolab_files-skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_files-skin-larry) >= %{roundcube_version}
-%endif
-%endif
+Requires:       roundcubemail(plugin-kolab_files-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       php-curl
 Provides:       roundcubemail(plugin-kolab_files) = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -400,10 +216,6 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-kolab_folders-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_folders-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_folders-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_folders-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_folders-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-kolab_folders) = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -415,26 +227,8 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-kolab_notes-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-Requires:       roundcubemail(plugin-kolab_notes-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-plesk) >= 0.4
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       roundcubemail(skin-enterprise) >= 0.3.7
-Requires:       roundcubemail(skin-kolab) >= 0.4
-Requires:       roundcubemail(plugin-kolab_notes-skin-larry) >= %{roundcube_version}
-%endif
-Requires:       roundcubemail-plugin-kolab_notes-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_notes-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_notes-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_notes-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       roundcubemail(skin-chameleon) >= 0.3.9
-Requires:       roundcubemail(plugin-kolab_notes-skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_notes-skin-larry) >= %{roundcube_version}
-%endif
-%endif
+Requires:       roundcubemail(plugin-kolab_notes-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       roundcubemail(plugin-acl) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-kolab_notes) = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -446,55 +240,17 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-kolab_shortcuts-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_shortcuts-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_shortcuts-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_shortcuts-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_shortcuts-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-kolab_shortcuts) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-kolab_shortcuts
 Plugin kolab_shortcuts
 
-%package -n roundcubemail-plugin-kolab_sso
-Summary:        Plugin kolab_sso
-Group:          Applications/Internet
-Requires:       roundcubemail(core) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_sso-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_sso-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_sso-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_sso-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-kolab_sso-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_sso) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_sso
-Plugin kolab_sso
-
 %package -n roundcubemail-plugin-kolab_tags
 Summary:        Plugin kolab_tags
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-kolab_tags-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-Requires:       roundcubemail(plugin-kolab_tags-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-plesk) >= 0.4
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       roundcubemail(skin-enterprise) >= 0.3.7
-Requires:       roundcubemail(skin-kolab) >= 0.4
-Requires:       roundcubemail(plugin-kolab_tags-skin-larry) >= %{roundcube_version}
-%endif
-Requires:       roundcubemail-plugin-kolab_tags-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_tags-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_tags-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-kolab_tags-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       roundcubemail(skin-chameleon) >= 0.3.9
-Requires:       roundcubemail(plugin-kolab_tags-skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_tags-skin-larry) >= %{roundcube_version}
-%endif
-%endif
+Requires:       roundcubemail(plugin-kolab_tags-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-kolab_tags) = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -506,10 +262,6 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-ldap_authentication-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-ldap_authentication-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-ldap_authentication-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-ldap_authentication-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-ldap_authentication-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-ldap_authentication) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-ldap_authentication
@@ -518,29 +270,10 @@
 %package -n roundcubemail-plugin-libcalendaring
 Summary:        Plugin libcalendaring
 Group:          Applications/Internet
+Requires:       php-sabre-vobject
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-libcalendaring-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-Obsoletes:      roundcubemail-plugin-libcalendaring-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-libcalendaring-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-plesk) >= 0.4
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       roundcubemail(skin-enterprise) >= 0.3.7
-Requires:       roundcubemail(skin-kolab) >= 0.4
-Requires:       roundcubemail(plugin-libcalendaring-skin-larry) >= %{roundcube_version}
-%endif
-Obsoletes:      roundcubemail-plugin-libcalendaring-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-libcalendaring-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-libcalendaring-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-libcalendaring-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       roundcubemail(skin-chameleon) >= 0.3.9
-Obsoletes:      roundcubemail-plugin-libcalendaring-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(plugin-libcalendaring-skin-larry) >= %{roundcube_version}
-%endif
-%endif
+Requires:       roundcubemail(plugin-libcalendaring-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-libcalendaring) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-libcalendaring
@@ -551,26 +284,7 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-libkolab-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-Requires:       roundcubemail(plugin-libkolab-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-plesk) >= 0.4
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       roundcubemail(skin-enterprise) >= 0.3.7
-Requires:       roundcubemail(skin-kolab) >= 0.4
-Requires:       roundcubemail(plugin-libkolab-skin-larry) >= %{roundcube_version}
-%endif
-Requires:       roundcubemail-plugin-libkolab-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-libkolab-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-libkolab-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-libkolab-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       roundcubemail(skin-chameleon) >= 0.3.9
-Requires:       roundcubemail(plugin-libkolab-skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-libkolab-skin-larry) >= %{roundcube_version}
-%endif
-%endif
+Requires:       roundcubemail(plugin-libkolab-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-libkolab
@@ -581,10 +295,6 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-loginfail-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-loginfail-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-loginfail-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-loginfail-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-loginfail-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-loginfail) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-loginfail
@@ -595,10 +305,6 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-logon_page-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-logon_page-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-logon_page-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-logon_page-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-logon_page-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-logon_page) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-logon_page
@@ -609,10 +315,6 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-odfviewer-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-odfviewer-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-odfviewer-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-odfviewer-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-odfviewer-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-odfviewer) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-odfviewer
@@ -623,10 +325,6 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-pdfviewer-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-pdfviewer-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-pdfviewer-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-pdfviewer-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-pdfviewer-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-pdfviewer) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-pdfviewer
@@ -637,10 +335,6 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-piwik_analytics-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-piwik_analytics-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-piwik_analytics-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-piwik_analytics-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-piwik_analytics-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-piwik_analytics) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-piwik_analytics
@@ -651,26 +345,8 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-tasklist-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-Requires:       roundcubemail(plugin-tasklist-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-plesk) >= 0.4
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       roundcubemail(skin-enterprise) >= 0.3.7
-Requires:       roundcubemail(skin-kolab) >= 0.4
-Requires:       roundcubemail(plugin-tasklist-skin-larry) >= %{roundcube_version}
-%endif
-Requires:       roundcubemail-plugin-tasklist-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-tasklist-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-tasklist-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail-plugin-tasklist-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       roundcubemail(skin-chameleon) >= 0.3.9
-Requires:       roundcubemail(plugin-tasklist-skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-tasklist-skin-larry) >= %{roundcube_version}
-%endif
-%endif
+Requires:       roundcubemail(plugin-tasklist-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       roundcubemail(plugin-acl) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-jqueryui) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-libcalendaring) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -684,10 +360,6 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-tinymce_config-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-tinymce_config-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-tinymce_config-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-tinymce_config-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-tinymce_config-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-tinymce_config) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-tinymce_config
@@ -698,11 +370,6 @@
 Group:          Applications/Internet
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-wap_client-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-wap_client-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-wap_client-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-wap_client-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      roundcubemail-plugin-wap_client-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-wap_client) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-wap_client
@@ -716,14 +383,6 @@
 %description -n roundcubemail-plugin-calendar-assets
 Plugin calendar Assets
 
-%package -n roundcubemail-plugin-html_converter-assets
-Summary:        Plugin html_converter Assets
-Group:          Applications/Internet
-Provides:       roundcubemail(plugin-html_converter-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-html_converter-assets
-Plugin html_converter Assets
-
 %package -n roundcubemail-plugin-kolab_2fa-assets
 Summary:        Plugin kolab_2fa Assets
 Group:          Applications/Internet
@@ -756,22 +415,6 @@
 %description -n roundcubemail-plugin-kolab_auth-assets
 Plugin kolab_auth Assets
 
-%package -n roundcubemail-plugin-kolab_auth_proxy-assets
-Summary:        Plugin kolab_auth_proxy Assets
-Group:          Applications/Internet
-Provides:       roundcubemail(plugin-kolab_auth_proxy-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_auth_proxy-assets
-Plugin kolab_auth_proxy Assets
-
-%package -n roundcubemail-plugin-kolab_chat-assets
-Summary:        Plugin kolab_chat Assets
-Group:          Applications/Internet
-Provides:       roundcubemail(plugin-kolab_chat-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_chat-assets
-Plugin kolab_chat Assets
-
 %package -n roundcubemail-plugin-kolab_config-assets
 Summary:        Plugin kolab_config Assets
 Group:          Applications/Internet
@@ -820,14 +463,6 @@
 %description -n roundcubemail-plugin-kolab_shortcuts-assets
 Plugin kolab_shortcuts Assets
 
-%package -n roundcubemail-plugin-kolab_sso-assets
-Summary:        Plugin kolab_sso Assets
-Group:          Applications/Internet
-Provides:       roundcubemail(plugin-kolab_sso-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_sso-assets
-Plugin kolab_sso Assets
-
 %package -n roundcubemail-plugin-kolab_tags-assets
 Summary:        Plugin kolab_tags Assets
 Group:          Applications/Internet
@@ -924,18 +559,6 @@
 %description -n roundcubemail-plugin-wap_client-assets
 Plugin wap_client Assets
 
-%package -n roundcubemail-plugin-calendar-skin-elastic
-Summary:        Plugin calendar / Skin elastic
-Group:          Applications/Internet
-Requires:       roundcubemail(plugin-calendar) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-calendar-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-calendar-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-calendar-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-calendar-skin-elastic
-Plugin calendar / Skin elastic
-
 %package -n roundcubemail-plugin-calendar-skin-larry
 Summary:        Plugin calendar / Skin larry
 Group:          Applications/Internet
@@ -948,17 +571,17 @@
 %description -n roundcubemail-plugin-calendar-skin-larry
 Plugin calendar / Skin larry
 
-%package -n roundcubemail-plugin-kolab_2fa-skin-elastic
-Summary:        Plugin kolab_2fa / Skin elastic
+%package -n roundcubemail-plugin-calendar-skin-classic
+Summary:        Plugin calendar / Skin classic
 Group:          Applications/Internet
-Requires:       roundcubemail(plugin-kolab_2fa) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_2fa-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_2fa-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_2fa-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       roundcubemail(plugin-calendar) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       roundcubemail(skin-classic) >= %{roundcube_version}
+Requires:       roundcubemail(plugin-calendar-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       roundcubemail(plugin-calendar-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       roundcubemail(plugin-calendar-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n roundcubemail-plugin-kolab_2fa-skin-elastic
-Plugin kolab_2fa / Skin elastic
+%description -n roundcubemail-plugin-calendar-skin-classic
+Plugin calendar / Skin classic
 
 %package -n roundcubemail-plugin-kolab_2fa-skin-larry
 Summary:        Plugin kolab_2fa / Skin larry
@@ -972,18 +595,6 @@
 %description -n roundcubemail-plugin-kolab_2fa-skin-larry
 Plugin kolab_2fa / Skin larry
 
-%package -n roundcubemail-plugin-kolab_activesync-skin-elastic
-Summary:        Plugin kolab_activesync / Skin elastic
-Group:          Applications/Internet
-Requires:       roundcubemail(plugin-kolab_activesync) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_activesync-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_activesync-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_activesync-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_activesync-skin-elastic
-Plugin kolab_activesync / Skin elastic
-
 %package -n roundcubemail-plugin-kolab_activesync-skin-larry
 Summary:        Plugin kolab_activesync / Skin larry
 Group:          Applications/Internet
@@ -996,17 +607,17 @@
 %description -n roundcubemail-plugin-kolab_activesync-skin-larry
 Plugin kolab_activesync / Skin larry
 
-%package -n roundcubemail-plugin-kolab_addressbook-skin-elastic
-Summary:        Plugin kolab_addressbook / Skin elastic
+%package -n roundcubemail-plugin-kolab_activesync-skin-classic
+Summary:        Plugin kolab_activesync / Skin classic
 Group:          Applications/Internet
-Requires:       roundcubemail(plugin-kolab_addressbook) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_addressbook-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_addressbook-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_addressbook-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       roundcubemail(plugin-kolab_activesync) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       roundcubemail(skin-classic) >= %{roundcube_version}
+Requires:       roundcubemail(plugin-kolab_activesync-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       roundcubemail(plugin-kolab_activesync-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       roundcubemail(plugin-kolab_activesync-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n roundcubemail-plugin-kolab_addressbook-skin-elastic
-Plugin kolab_addressbook / Skin elastic
+%description -n roundcubemail-plugin-kolab_activesync-skin-classic
+Plugin kolab_activesync / Skin classic
 
 %package -n roundcubemail-plugin-kolab_addressbook-skin-larry
 Summary:        Plugin kolab_addressbook / Skin larry
@@ -1020,41 +631,17 @@
 %description -n roundcubemail-plugin-kolab_addressbook-skin-larry
 Plugin kolab_addressbook / Skin larry
 
-%package -n roundcubemail-plugin-kolab_chat-skin-elastic
-Summary:        Plugin kolab_chat / Skin elastic
-Group:          Applications/Internet
-Requires:       roundcubemail(plugin-kolab_chat) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_chat-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_chat-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_chat-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_chat-skin-elastic
-Plugin kolab_chat / Skin elastic
-
-%package -n roundcubemail-plugin-kolab_chat-skin-larry
-Summary:        Plugin kolab_chat / Skin larry
+%package -n roundcubemail-plugin-kolab_addressbook-skin-classic
+Summary:        Plugin kolab_addressbook / Skin classic
 Group:          Applications/Internet
-Requires:       roundcubemail(plugin-kolab_chat) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-larry) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_chat-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_chat-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_chat-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_chat-skin-larry
-Plugin kolab_chat / Skin larry
-
-%package -n roundcubemail-plugin-kolab_delegation-skin-elastic
-Summary:        Plugin kolab_delegation / Skin elastic
-Group:          Applications/Internet
-Requires:       roundcubemail(plugin-kolab_delegation) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_delegation-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_delegation-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_delegation-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       roundcubemail(plugin-kolab_addressbook) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       roundcubemail(skin-classic) >= %{roundcube_version}
+Requires:       roundcubemail(plugin-kolab_addressbook-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       roundcubemail(plugin-kolab_addressbook-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       roundcubemail(plugin-kolab_addressbook-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n roundcubemail-plugin-kolab_delegation-skin-elastic
-Plugin kolab_delegation / Skin elastic
+%description -n roundcubemail-plugin-kolab_addressbook-skin-classic
+Plugin kolab_addressbook / Skin classic
 
 %package -n roundcubemail-plugin-kolab_delegation-skin-larry
 Summary:        Plugin kolab_delegation / Skin larry
@@ -1068,17 +655,17 @@
 %description -n roundcubemail-plugin-kolab_delegation-skin-larry
 Plugin kolab_delegation / Skin larry
 
-%package -n roundcubemail-plugin-kolab_files-skin-elastic
-Summary:        Plugin kolab_files / Skin elastic
+%package -n roundcubemail-plugin-kolab_delegation-skin-classic
+Summary:        Plugin kolab_delegation / Skin classic
 Group:          Applications/Internet
-Requires:       roundcubemail(plugin-kolab_files) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_files-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_files-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_files-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       roundcubemail(plugin-kolab_delegation) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       roundcubemail(skin-classic) >= %{roundcube_version}
+Requires:       roundcubemail(plugin-kolab_delegation-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       roundcubemail(plugin-kolab_delegation-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       roundcubemail(plugin-kolab_delegation-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n roundcubemail-plugin-kolab_files-skin-elastic
-Plugin kolab_files / Skin elastic
+%description -n roundcubemail-plugin-kolab_delegation-skin-classic
+Plugin kolab_delegation / Skin classic
 
 %package -n roundcubemail-plugin-kolab_files-skin-larry
 Summary:        Plugin kolab_files / Skin larry
@@ -1092,18 +679,6 @@
 %description -n roundcubemail-plugin-kolab_files-skin-larry
 Plugin kolab_files / Skin larry
 
-%package -n roundcubemail-plugin-kolab_notes-skin-elastic
-Summary:        Plugin kolab_notes / Skin elastic
-Group:          Applications/Internet
-Requires:       roundcubemail(plugin-kolab_notes) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_notes-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_notes-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_notes-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_notes-skin-elastic
-Plugin kolab_notes / Skin elastic
-
 %package -n roundcubemail-plugin-kolab_notes-skin-larry
 Summary:        Plugin kolab_notes / Skin larry
 Group:          Applications/Internet
@@ -1116,18 +691,6 @@
 %description -n roundcubemail-plugin-kolab_notes-skin-larry
 Plugin kolab_notes / Skin larry
 
-%package -n roundcubemail-plugin-kolab_tags-skin-elastic
-Summary:        Plugin kolab_tags / Skin elastic
-Group:          Applications/Internet
-Requires:       roundcubemail(plugin-kolab_tags) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_tags-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_tags-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_tags-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_tags-skin-elastic
-Plugin kolab_tags / Skin elastic
-
 %package -n roundcubemail-plugin-kolab_tags-skin-larry
 Summary:        Plugin kolab_tags / Skin larry
 Group:          Applications/Internet
@@ -1140,54 +703,6 @@
 %description -n roundcubemail-plugin-kolab_tags-skin-larry
 Plugin kolab_tags / Skin larry
 
-%package -n roundcubemail-plugin-libcalendaring-skin-larry
-Summary:        Plugin libcalendaring / Skin larry
-Group:          Applications/Internet
-Requires:       roundcubemail(plugin-libcalendaring) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-larry) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-libcalendaring-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-libcalendaring-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-libcalendaring-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-libcalendaring-skin-larry
-Plugin libcalendaring / Skin larry
-
-%package -n roundcubemail-plugin-libkolab-skin-elastic
-Summary:        Plugin libkolab / Skin elastic
-Group:          Applications/Internet
-Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-libkolab-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-libkolab-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-libkolab-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-libkolab-skin-elastic
-Plugin libkolab / Skin elastic
-
-%package -n roundcubemail-plugin-libkolab-skin-larry
-Summary:        Plugin libkolab / Skin larry
-Group:          Applications/Internet
-Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-larry) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-libkolab-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-libkolab-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-libkolab-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-libkolab-skin-larry
-Plugin libkolab / Skin larry
-
-%package -n roundcubemail-plugin-tasklist-skin-elastic
-Summary:        Plugin tasklist / Skin elastic
-Group:          Applications/Internet
-Requires:       roundcubemail(plugin-tasklist) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-elastic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-tasklist-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-tasklist-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-tasklist-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-tasklist-skin-elastic
-Plugin tasklist / Skin elastic
-
 %package -n roundcubemail-plugin-tasklist-skin-larry
 Summary:        Plugin tasklist / Skin larry
 Group:          Applications/Internet
@@ -1200,14 +715,6 @@
 %description -n roundcubemail-plugin-tasklist-skin-larry
 Plugin tasklist / Skin larry
 
-%package -n roundcubemail-plugin-calendar-skin-elastic-assets
-Summary:        Plugin calendar / Skin elastic (Assets)
-Group:          Applications/Internet
-Provides:       roundcubemail(plugin-calendar-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-calendar-skin-elastic-assets
-Plugin calendar / Skin elastic (Assets Package)
-
 %package -n roundcubemail-plugin-calendar-skin-larry-assets
 Summary:        Plugin calendar / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1216,13 +723,13 @@
 %description -n roundcubemail-plugin-calendar-skin-larry-assets
 Plugin calendar / Skin larry (Assets Package)
 
-%package -n roundcubemail-plugin-kolab_2fa-skin-elastic-assets
-Summary:        Plugin kolab_2fa / Skin elastic (Assets)
+%package -n roundcubemail-plugin-calendar-skin-classic-assets
+Summary:        Plugin calendar / Skin classic (Assets)
 Group:          Applications/Internet
-Provides:       roundcubemail(plugin-kolab_2fa-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       roundcubemail(plugin-calendar-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n roundcubemail-plugin-kolab_2fa-skin-elastic-assets
-Plugin kolab_2fa / Skin elastic (Assets Package)
+%description -n roundcubemail-plugin-calendar-skin-classic-assets
+Plugin calendar / Skin classic (Assets Package)
 
 %package -n roundcubemail-plugin-kolab_2fa-skin-larry-assets
 Summary:        Plugin kolab_2fa / Skin larry (Assets)
@@ -1232,14 +739,6 @@
 %description -n roundcubemail-plugin-kolab_2fa-skin-larry-assets
 Plugin kolab_2fa / Skin larry (Assets Package)
 
-%package -n roundcubemail-plugin-kolab_activesync-skin-elastic-assets
-Summary:        Plugin kolab_activesync / Skin elastic (Assets)
-Group:          Applications/Internet
-Provides:       roundcubemail(plugin-kolab_activesync-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_activesync-skin-elastic-assets
-Plugin kolab_activesync / Skin elastic (Assets Package)
-
 %package -n roundcubemail-plugin-kolab_activesync-skin-larry-assets
 Summary:        Plugin kolab_activesync / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1248,13 +747,13 @@
 %description -n roundcubemail-plugin-kolab_activesync-skin-larry-assets
 Plugin kolab_activesync / Skin larry (Assets Package)
 
-%package -n roundcubemail-plugin-kolab_addressbook-skin-elastic-assets
-Summary:        Plugin kolab_addressbook / Skin elastic (Assets)
+%package -n roundcubemail-plugin-kolab_activesync-skin-classic-assets
+Summary:        Plugin kolab_activesync / Skin classic (Assets)
 Group:          Applications/Internet
-Provides:       roundcubemail(plugin-kolab_addressbook-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       roundcubemail(plugin-kolab_activesync-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n roundcubemail-plugin-kolab_addressbook-skin-elastic-assets
-Plugin kolab_addressbook / Skin elastic (Assets Package)
+%description -n roundcubemail-plugin-kolab_activesync-skin-classic-assets
+Plugin kolab_activesync / Skin classic (Assets Package)
 
 %package -n roundcubemail-plugin-kolab_addressbook-skin-larry-assets
 Summary:        Plugin kolab_addressbook / Skin larry (Assets)
@@ -1264,29 +763,13 @@
 %description -n roundcubemail-plugin-kolab_addressbook-skin-larry-assets
 Plugin kolab_addressbook / Skin larry (Assets Package)
 
-%package -n roundcubemail-plugin-kolab_chat-skin-elastic-assets
-Summary:        Plugin kolab_chat / Skin elastic (Assets)
-Group:          Applications/Internet
-Provides:       roundcubemail(plugin-kolab_chat-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_chat-skin-elastic-assets
-Plugin kolab_chat / Skin elastic (Assets Package)
-
-%package -n roundcubemail-plugin-kolab_chat-skin-larry-assets
-Summary:        Plugin kolab_chat / Skin larry (Assets)
-Group:          Applications/Internet
-Provides:       roundcubemail(plugin-kolab_chat-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_chat-skin-larry-assets
-Plugin kolab_chat / Skin larry (Assets Package)
-
-%package -n roundcubemail-plugin-kolab_delegation-skin-elastic-assets
-Summary:        Plugin kolab_delegation / Skin elastic (Assets)
+%package -n roundcubemail-plugin-kolab_addressbook-skin-classic-assets
+Summary:        Plugin kolab_addressbook / Skin classic (Assets)
 Group:          Applications/Internet
-Provides:       roundcubemail(plugin-kolab_delegation-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       roundcubemail(plugin-kolab_addressbook-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n roundcubemail-plugin-kolab_delegation-skin-elastic-assets
-Plugin kolab_delegation / Skin elastic (Assets Package)
+%description -n roundcubemail-plugin-kolab_addressbook-skin-classic-assets
+Plugin kolab_addressbook / Skin classic (Assets Package)
 
 %package -n roundcubemail-plugin-kolab_delegation-skin-larry-assets
 Summary:        Plugin kolab_delegation / Skin larry (Assets)
@@ -1296,13 +779,13 @@
 %description -n roundcubemail-plugin-kolab_delegation-skin-larry-assets
 Plugin kolab_delegation / Skin larry (Assets Package)
 
-%package -n roundcubemail-plugin-kolab_files-skin-elastic-assets
-Summary:        Plugin kolab_files / Skin elastic (Assets)
+%package -n roundcubemail-plugin-kolab_delegation-skin-classic-assets
+Summary:        Plugin kolab_delegation / Skin classic (Assets)
 Group:          Applications/Internet
-Provides:       roundcubemail(plugin-kolab_files-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       roundcubemail(plugin-kolab_delegation-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n roundcubemail-plugin-kolab_files-skin-elastic-assets
-Plugin kolab_files / Skin elastic (Assets Package)
+%description -n roundcubemail-plugin-kolab_delegation-skin-classic-assets
+Plugin kolab_delegation / Skin classic (Assets Package)
 
 %package -n roundcubemail-plugin-kolab_files-skin-larry-assets
 Summary:        Plugin kolab_files / Skin larry (Assets)
@@ -1312,14 +795,6 @@
 %description -n roundcubemail-plugin-kolab_files-skin-larry-assets
 Plugin kolab_files / Skin larry (Assets Package)
 
-%package -n roundcubemail-plugin-kolab_notes-skin-elastic-assets
-Summary:        Plugin kolab_notes / Skin elastic (Assets)
-Group:          Applications/Internet
-Provides:       roundcubemail(plugin-kolab_notes-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_notes-skin-elastic-assets
-Plugin kolab_notes / Skin elastic (Assets Package)
-
 %package -n roundcubemail-plugin-kolab_notes-skin-larry-assets
 Summary:        Plugin kolab_notes / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1328,14 +803,6 @@
 %description -n roundcubemail-plugin-kolab_notes-skin-larry-assets
 Plugin kolab_notes / Skin larry (Assets Package)
 
-%package -n roundcubemail-plugin-kolab_tags-skin-elastic-assets
-Summary:        Plugin kolab_tags / Skin elastic (Assets)
-Group:          Applications/Internet
-Provides:       roundcubemail(plugin-kolab_tags-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_tags-skin-elastic-assets
-Plugin kolab_tags / Skin elastic (Assets Package)
-
 %package -n roundcubemail-plugin-kolab_tags-skin-larry-assets
 Summary:        Plugin kolab_tags / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1347,35 +814,29 @@
 %package -n roundcubemail-plugin-libcalendaring-skin-larry-assets
 Summary:        Plugin libcalendaring / Skin larry (Assets)
 Group:          Applications/Internet
+Requires:       roundcubemail(plugin-libcalendaring) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       roundcubemail(skin-larry) >= %{roundcube_version}
+Obsoletes:      roundcubemail-plugin-libcalendaring-skin-larry
+Provides:       roundcubemail(plugin-libcalendaring-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       roundcubemail(plugin-libcalendaring-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-libcalendaring-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-libcalendaring-skin-larry-assets
 Plugin libcalendaring / Skin larry (Assets Package)
 
-%package -n roundcubemail-plugin-libkolab-skin-elastic-assets
-Summary:        Plugin libkolab / Skin elastic (Assets)
-Group:          Applications/Internet
-Provides:       roundcubemail(plugin-libkolab-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-libkolab-skin-elastic-assets
-Plugin libkolab / Skin elastic (Assets Package)
-
 %package -n roundcubemail-plugin-libkolab-skin-larry-assets
 Summary:        Plugin libkolab / Skin larry (Assets)
 Group:          Applications/Internet
+Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       roundcubemail(skin-larry) >= %{roundcube_version}
+Obsoletes:      roundcubemail-plugin-libkolab-skin-larry
+Provides:       roundcubemail(plugin-libkolab-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       roundcubemail(plugin-libkolab-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       roundcubemail(plugin-libkolab-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-libkolab-skin-larry-assets
 Plugin libkolab / Skin larry (Assets Package)
 
-%package -n roundcubemail-plugin-tasklist-skin-elastic-assets
-Summary:        Plugin tasklist / Skin elastic (Assets)
-Group:          Applications/Internet
-Provides:       roundcubemail(plugin-tasklist-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-tasklist-skin-elastic-assets
-Plugin tasklist / Skin elastic (Assets Package)
-
 %package -n roundcubemail-plugin-tasklist-skin-larry-assets
 Summary:        Plugin tasklist / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1385,47 +846,30 @@
 Plugin tasklist / Skin larry (Assets Package)
 
 %prep
-%setup -q  -c "%{name}-%{version}%{?dash_rel_suffix}"
-
-pushd %{name}-%{version}%{?dash_rel_suffix}
+%setup -q  -c "%{name}-%{version}"
 
-ls -l
-mkdir -p skins/elastic/
-rm -rvf skins/elastic/images
-mkdir -p skins/elastic/images/
-cp -av %{datadir}/skins/elastic/images/* skins/elastic/images/. || :
-cp -av %{datadir}/skins/elastic/styles/ skins/elastic/. || :
-
-%patch0000 -p1
+pushd %{name}-%{version}
 
 %if 0%{?plesk}
 # Provide defaults for Plesk
-cp -afv %{SOURCE100} plugins/calendar/config.inc.php.dist
-cp -afv %{SOURCE101} plugins/kolab_addressbook/config.inc.php.dist
-cp -afv %{SOURCE102} plugins/kolab_chat/config.inc.php.dist
-cp -afv %{SOURCE103} plugins/kolab_folders/config.inc.php.dist
-cp -afv %{SOURCE104} plugins/libkolab/config.inc.php.dist
+cp -af %{SOURCE100} plugins/calendar/config.inc.php.dist
+cp -af %{SOURCE101} plugins/kolab_addressbook/config.inc.php.dist
+cp -af %{SOURCE102} plugins/kolab_folders/config.inc.php.dist
+cp -af %{SOURCE103} plugins/libkolab/config.inc.php.dist
 %endif
 
+%patch1001 -p1
+
 find -type d -name "helpdocs" -exec rm -rvf {} \; 2>/dev/null || :
 
 rm -rf plugins/kolab_zpush
 rm -rf plugins/owncloud
 
-# Remove hidden files and directories
-find . -type f -name ".*" -delete | while read file; do
-    rm -rvf ${file}
-done
+# Remove the results of patching when there's an incidental offset
+find . -type f -name "*.orig" -delete
 
-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 hidden files
+find . -type f -name ".*" -delete
 
 # Eliminate links
 for link in `find . -type l`; do
@@ -1436,8 +880,8 @@
 
 popd
 
-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")
+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}
 
@@ -1448,54 +892,11 @@
         echo "Requires:       roundcubemail(core) >= %%{roundcube_version}"
         echo "Requires:       roundcubemail(plugin-$(basename ${plugin})-assets) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
         if [ -d "${plugin}/skins/" ]; then
-            echo "%%if 0%%{?plesk}"
-            if [ -d "${target_dir}/skins/elastic/" ]; then
-                echo "Requires:       roundcubemail(plugin-$(basename ${plugin})-skin-elastic) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            else
-                echo "Obsoletes:      roundcubemail-plugin-$(basename ${plugin})-skin-elastic < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-                echo "Obsoletes:      roundcubemail-plugin-$(basename ${plugin})-skin-elastic-assets < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            fi
-            echo "Requires:       roundcubemail(skin-plesk) >= 0.4"
-            echo "%%else"
-            echo "%%if 0%%{?kolab_enterprise}"
-            echo "%%if 0%%{?bootstrap} < 1"
-            echo "Requires:       roundcubemail(skin-enterprise) >= 0.3.7"
-            echo "Requires:       roundcubemail(skin-kolab) >= 0.4"
-            echo "Requires:       roundcubemail(plugin-$(basename ${plugin})-skin-larry) >= %%{roundcube_version}"
-            echo "%%endif"
-            if [ -d "${target_dir}/skins/elastic/" ]; then
-                echo "Requires:       roundcubemail-plugin-$(basename ${plugin})-skin-elastic = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-                echo "Requires:       roundcubemail-plugin-$(basename ${plugin})-skin-elastic-assets = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            else
-                echo "Obsoletes:      roundcubemail-plugin-$(basename ${plugin})-skin-elastic < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-                echo "Obsoletes:      roundcubemail-plugin-$(basename ${plugin})-skin-elastic-assets < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            fi
-            if [ -d "${target_dir}/skins/larry/" ]; then
-                echo "Requires:       roundcubemail-plugin-$(basename ${plugin})-skin-larry = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-                echo "Requires:       roundcubemail-plugin-$(basename ${plugin})-skin-larry-assets = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            else
-                echo "Obsoletes:      roundcubemail-plugin-$(basename ${plugin})-skin-larry < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-                echo "Obsoletes:      roundcubemail-plugin-$(basename ${plugin})-skin-larry-assets < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            fi
-            echo "%%else"
-            echo "Requires:       roundcubemail(skin-chameleon) >= 0.3.9"
-            if [ -d "${target_dir}/skins/elastic/" ]; then
-                echo "Requires:       roundcubemail(plugin-$(basename ${plugin})-skin-elastic) >= %%{roundcube_version}"
-            else
-                echo "Obsoletes:      roundcubemail-plugin-$(basename ${plugin})-skin-elastic < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            fi
-            echo "Requires:       roundcubemail(plugin-$(basename ${plugin})-skin-larry) >= %%{roundcube_version}"
-            echo "%%endif"
-            echo "%%endif"
-        else
-            echo "Obsoletes:      roundcubemail-plugin-$(basename ${plugin})-skin-elastic < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            echo "Obsoletes:      roundcubemail-plugin-$(basename ${plugin})-skin-elastic-assets < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            echo "Obsoletes:      roundcubemail-plugin-$(basename ${plugin})-skin-larry < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            echo "Obsoletes:      roundcubemail-plugin-$(basename ${plugin})-skin-larry-assets < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+            echo "Requires:       roundcubemail(plugin-$(basename ${plugin})-skin) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
         fi
 
         for rplugin in $(grep -rn "require_plugin" ${plugin}/ | cut -d"'" -f2 | sort); do
-            if [ -d "%{name}-%{version}%{?dash_rel_suffix}/plugins/${rplugin}" ]; then
+            if [ -d "%{name}-%{version}/plugins/${rplugin}" ]; then
                 echo "Requires:       roundcubemail(plugin-${rplugin}) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
             else
                 echo "Requires:       roundcubemail(plugin-${rplugin}) >= %%{roundcube_version}"
@@ -1522,6 +923,9 @@
     (
         echo "%files -n roundcubemail-plugin-$(basename ${plugin}) -f plugin-$(basename ${plugin}).files"
         echo "%defattr(-,root,root,-)"
+        if [ -d "${plugin}/config" -o -f "${plugin}/config.inc.php" -o -f "${plugin}/config.inc.php.dist" ]; then
+            echo "%attr(0640,root,%%{httpd_group}) %config(noreplace) %%{_sysconfdir}/roundcubemail/$(basename ${plugin}).inc.php"
+        fi
         echo ""
     ) >> plugins.files
 
@@ -1585,9 +989,9 @@
         echo ""
     ) >> plugins-assets.files
 
-    for skin in elastic larry; do
+    for skin in larry classic; do
         for dir in $(find ${target_dir} -type d -name "${skin}" | grep -v "helpdocs" | 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")
+            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}
 
@@ -1650,35 +1054,11 @@
 
 %build
 
-ls -l
-
-pushd %{name}-%{version}%{?dash_rel_suffix}
-
-# Compile and compress the CSS
-for file in `find plugins/ -type f -name "styles.less" -o -name "print.less" -o -name "embed.less" -o -name "libkolab.less"`; do
-    %{_bindir}/lessc --relative-urls ${file} > $(dirname ${file})/$(basename ${file} .less).css
-
-    source="$(dirname ${file})/$(basename ${file} .less).css"
-    target="../$(
-        echo ${source} | \
-        sed -r \
-            -e 's|plugins/([a-z0-9_]+)/|roundcubemail-plugins-kolab-plugin-\1-skin-elastic-%{version}%{?dash_rel_suffix}/plugins/\1/|g'
-    )"
-
-    sed -i \
-        -e "s|../../../skins/elastic/images/contactpic.png|../../../../skins/elastic/images/contactpic.png|" \
-        -e "s|../../../skins/elastic/images/watermark.jpg|../../../../skins/elastic/images/watermark.jpg|" \
-        ${source}
-
-    cp -av ${source} ${target}
-done
-
 %install
 %{__install} -pm 755 %{SOURCE1} .
 
 function new_files() {
-    find %{buildroot}%{confdir} -type f -exec echo "%attr(0640,root,%%{httpd_group}) %config(noreplace) {}" \; > current-new.files
-    find %{buildroot}%{datadir} -type d -exec echo "%dir {}" \; >> current-new.files
+    find %{buildroot}%{datadir} -type d -exec echo "%dir {}" \; > current-new.files
     find %{buildroot}%{datadir} -type f >> current-new.files
     find %{buildroot}%{datadir} -type l >> current-new.files
 
@@ -1710,32 +1090,34 @@
 echo "Dividing Plugins, Plugin Assets, Plugin Skins and Plugin Skin Assets and Non-Assets"
 echo "================================================================="
 
-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}"
-        asset_dir="%{name}-plugin-${plugin}-skin-${skin}-assets-%{version}%{?dash_rel_suffix}"
+for plugin in $(find %{name}-%{version}/plugins/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | sort); do
+    for skin in larry classic; do
+        orig_dir="%{name}-plugin-${plugin}-skin-${skin}-%{version}"
+        asset_dir="%{name}-plugin-${plugin}-skin-${skin}-assets-%{version}"
 
         # Compress the CSS
         for file in `find ${orig_dir} -type f -name "*.css"`; do
             asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
             %{__mkdir_p} ${asset_loc}
-            cat ${file} | %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) || \
-                %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
+            cat ${file} | %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) && \
+                %{__rm} -rf ${file} || \
+                %{__mv} -v ${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}) || \
-                %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
+            uglifyjs ${file} > ${asset_loc}/$(basename ${file}) && \
+                %{__rm} -rf ${file} || \
+                %{__mv} -v ${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}
-            %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
+            %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
         done || :
 
         # Other assets
@@ -1750,12 +1132,11 @@
                 -name "*.swf" -o \
                 -name "*.tif" -o \
                 -name "*.ttf" -o \
-                -name "*.woff" -o \
-                -name "*.woff2"
+                -name "*.woff"
             ); do
             asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
             %{__mkdir_p} ${asset_loc}
-            %{__cp} -av ${file} ${asset_loc}/$(basename $file)
+            %{__mv} -vf ${file} ${asset_loc}/$(basename $file)
         done || :
 
         # Purge empty directories
@@ -1763,30 +1144,32 @@
     done
 
     # Skin-independent assets
-    orig_dir="%{name}-plugin-${plugin}-%{version}%{?dash_rel_suffix}"
-    asset_dir="%{name}-plugin-${plugin}-assets-%{version}%{?dash_rel_suffix}"
+    orig_dir="%{name}-plugin-${plugin}-%{version}"
+    asset_dir="%{name}-plugin-${plugin}-assets-%{version}"
 
     # Compress the CSS
     for file in `find ${orig_dir} -type f -name "*.css"`; do
         asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
         %{__mkdir_p} ${asset_loc}
-        cat ${file} | %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) || \
-            %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
+        cat ${file} | %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) && \
+            %{__rm} -rf ${file} || \
+            %{__mv} -v ${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}) || \
-            %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
+        uglifyjs ${file} > ${asset_loc}/$(basename ${file}) && \
+            %{__rm} -rf ${file} || \
+            %{__mv} -v ${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}
-        %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
+        %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
     done
 
     # Other assets
@@ -1801,41 +1184,40 @@
             -name "*.swf" -o \
             -name "*.tif" -o \
             -name "*.ttf" -o \
-            -name "*.woff" -o \
-            -name "*.woff2"
+            -name "*.woff"
         ); do
         asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
         %{__mkdir_p} ${asset_loc}
-        %{__cp} -av ${file} ${asset_loc}/$(basename $file)
+        %{__mv} -vf ${file} ${asset_loc}/$(basename $file)
     done
 
     if [ "${plugin}" == "pdfviewer" ]; then
-        %{__cp} -av ${orig_dir}/plugins/pdfviewer/viewer/locale ${asset_dir}/plugins/pdfviewer/viewer/.
-        %{__cp} -av ${orig_dir}/plugins/pdfviewer/viewer/viewer.html ${asset_dir}/plugins/pdfviewer/viewer/.
+        %{__mv} -vf ${orig_dir}/plugins/pdfviewer/viewer/locale ${asset_dir}/plugins/pdfviewer/viewer/.
+        %{__mv} -vf ${orig_dir}/plugins/pdfviewer/viewer/viewer.html ${asset_dir}/plugins/pdfviewer/viewer/.
     fi
 
     # Purge empty directories
     find ${orig_dir} -type d -empty -delete || :
 
     # Install the assets
-    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"))
+    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"))
         %{__mkdir_p} ${asset_loc}
-        %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
+        %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
     done || :
 
     new_files > plugin-${plugin}-assets.files
 
-    echo "== Files for plugin-${plugin}-assets: =="
+    echo "== Files for plugin ${plugin}: =="
     cat plugin-${plugin}-assets.files
     echo "==========================="
 
     %{__mkdir_p} %{buildroot}%{plugindir}
-    cp -av %{name}-plugin-${plugin}-%{version}%{?dash_rel_suffix}/plugins/${plugin} %{buildroot}%{plugindir}/.
+    cp -a %{name}-plugin-${plugin}-%{version}/plugins/${plugin} %{buildroot}%{plugindir}/.
 
     if [ -f "%{buildroot}%{plugindir}/${plugin}/config.inc.php.dist" ]; then
         pushd %{buildroot}%{plugindir}/${plugin}
-        %{__mv} -vf config.inc.php.dist %{buildroot}%{confdir}/${plugin}.inc.php
+        %{__mv} config.inc.php.dist %{buildroot}%{confdir}/${plugin}.inc.php
         ln -s ../../../../..%{confdir}/${plugin}.inc.php config.inc.php
         popd
     fi
@@ -1850,41 +1232,40 @@
 
     new_files > plugin-${plugin}.files
 
-    echo "== Files for plugin-${plugin}: =="
+    echo "== Files for plugin ${plugin}: =="
     cat plugin-${plugin}.files
     echo "==========================="
 done
 
-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
+for plugin in $(find %{name}-%{version}/plugins/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | sort); do
+    for skin in larry classic; do
         touch plugin-${plugin}-skin-${skin}.files
         touch plugin-${plugin}-skin-${skin}-assets.files
 
-        if [ ! -d "%{name}-plugin-${plugin}-skin-${skin}-%{version}%{?dash_rel_suffix}/plugins/${plugin}/skins" ]; then
-            rm -vf plugin-${plugin}-skin-${skin}.files
-            rm -vf plugin-${plugin}-skin-${skin}-assets.files
-            continue
-        fi
-
-        %{__install} -d %{buildroot}%{plugindir}/${plugin}/skins/
-        cp -av %{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
-            rm -f plugin-${plugin}-skin-${skin}.files
+        if [ -d "%{name}-plugin-${plugin}-skin-${skin}-%{version}/plugins/${plugin}/skins/${skin}" ]; then
+            %{__install} -d %{buildroot}%{plugindir}/${plugin}/skins/
+            cp -a %{name}-plugin-${plugin}-skin-${skin}-%{version}/plugins/${plugin}/skins/${skin} %{buildroot}%{plugindir}/${plugin}/skins/.
+
+            new_files > plugin-${plugin}-skin-${skin}.files
+
+            echo "== Files for skin ${plugin}-${skin}: =="
+            cat plugin-${plugin}-skin-${skin}.files
+            echo "==========================="
         fi
 
         # Install the assets
-        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"))
+        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"))
             %{__mkdir_p} ${asset_loc}
             %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
-        done
+        done || :
 
         new_files > plugin-${plugin}-skin-${skin}-assets.files
-        if [ ! -s "plugin-${plugin}-skin-${skin}-assets.files" ]; then
-            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
 
@@ -1928,16 +1309,6 @@
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
 fi
 
-%pre -n roundcubemail-plugin-kolab_auth_proxy
-if [ -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
-fi
-
-%pre -n roundcubemail-plugin-kolab_chat
-if [ -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
-fi
-
 %pre -n roundcubemail-plugin-kolab_config
 if [ -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
@@ -1968,11 +1339,6 @@
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
 fi
 
-%pre -n roundcubemail-plugin-kolab_sso
-if [ -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
-fi
-
 %pre -n roundcubemail-plugin-kolab_tags
 if [ -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
@@ -1993,12 +1359,11 @@
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
 fi
 
-%pre -n roundcubemail-plugin-loginfail
-if [ -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
+%pre -n roundcubemail-plugin-logon_page
+if [ -f "%{plugindir}/logon_page/logon_page.html" ]; then
+    mv -vf %{plugindir}/logon_page/logon_page.html %{confdir}/logon_page.html
 fi
 
-%pre -n roundcubemail-plugin-logon_page
 if [ -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
 fi
@@ -2063,24 +1428,9 @@
 
 done
 
-%posttrans -n roundcubemail-plugin-html_converter
-if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
-%if 0%{?with_systemd}
-            /bin/systemctl condrestart %{httpd_name}.service
-%else
-            /sbin/service %{httpd_name} condrestart
-%endif
-        fi
-    fi
-    %{__mkdir_p} %{_localstatedir}/lib/rpm-state/roundcubemail/
-    touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
-fi
-
 %posttrans -n roundcubemail-plugin-kolab_2fa
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2095,7 +1445,7 @@
 
 %posttrans -n roundcubemail-plugin-kolab_activesync
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2110,7 +1460,7 @@
 
 %posttrans -n roundcubemail-plugin-kolab_addressbook
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2125,37 +1475,7 @@
 
 %posttrans -n roundcubemail-plugin-kolab_auth
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
-%if 0%{?with_systemd}
-            /bin/systemctl condrestart %{httpd_name}.service
-%else
-            /sbin/service %{httpd_name} condrestart
-%endif
-        fi
-    fi
-    %{__mkdir_p} %{_localstatedir}/lib/rpm-state/roundcubemail/
-    touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
-fi
-
-%posttrans -n roundcubemail-plugin-kolab_auth_proxy
-if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
-%if 0%{?with_systemd}
-            /bin/systemctl condrestart %{httpd_name}.service
-%else
-            /sbin/service %{httpd_name} condrestart
-%endif
-        fi
-    fi
-    %{__mkdir_p} %{_localstatedir}/lib/rpm-state/roundcubemail/
-    touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
-fi
-
-%posttrans -n roundcubemail-plugin-kolab_chat
-if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2170,7 +1490,7 @@
 
 %posttrans -n roundcubemail-plugin-kolab_config
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2185,7 +1505,7 @@
 
 %posttrans -n roundcubemail-plugin-kolab_delegation
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2200,7 +1520,7 @@
 
 %posttrans -n roundcubemail-plugin-kolab_files
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2215,7 +1535,7 @@
 
 %posttrans -n roundcubemail-plugin-kolab_folders
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2230,7 +1550,7 @@
 
 %posttrans -n roundcubemail-plugin-kolab_notes
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2245,22 +1565,7 @@
 
 %posttrans -n roundcubemail-plugin-kolab_shortcuts
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
-%if 0%{?with_systemd}
-            /bin/systemctl condrestart %{httpd_name}.service
-%else
-            /sbin/service %{httpd_name} condrestart
-%endif
-        fi
-    fi
-    %{__mkdir_p} %{_localstatedir}/lib/rpm-state/roundcubemail/
-    touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
-fi
-
-%posttrans -n roundcubemail-plugin-kolab_sso
-if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2275,7 +1580,7 @@
 
 %posttrans -n roundcubemail-plugin-kolab_tags
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2290,7 +1595,7 @@
 
 %posttrans -n roundcubemail-plugin-ldap_authentication
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2305,7 +1610,7 @@
 
 %posttrans -n roundcubemail-plugin-libcalendaring
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2320,7 +1625,7 @@
 
 %posttrans -n roundcubemail-plugin-libkolab
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2348,24 +1653,9 @@
 
 done
 
-%posttrans -n roundcubemail-plugin-loginfail
-if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
-%if 0%{?with_systemd}
-            /bin/systemctl condrestart %{httpd_name}.service
-%else
-            /sbin/service %{httpd_name} condrestart
-%endif
-        fi
-    fi
-    %{__mkdir_p} %{_localstatedir}/lib/rpm-state/roundcubemail/
-    touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
-fi
-
 %posttrans -n roundcubemail-plugin-logon_page
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2380,7 +1670,7 @@
 
 %posttrans -n roundcubemail-plugin-odfviewer
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2395,7 +1685,7 @@
 
 %posttrans -n roundcubemail-plugin-pdfviewer
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2410,7 +1700,7 @@
 
 %posttrans -n roundcubemail-plugin-piwik_analytics
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2425,7 +1715,7 @@
 
 %posttrans -n roundcubemail-plugin-tasklist
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2455,7 +1745,7 @@
 
 %posttrans -n roundcubemail-plugin-tinymce_config
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2470,7 +1760,7 @@
 
 %posttrans -n roundcubemail-plugin-wap_client
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini"  -o -f "%{php_inidir}/apcu.ini" ]; then
+    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
@@ -2493,39 +1783,41 @@
 
 %files -n roundcubemail-plugin-calendar -f plugin-calendar.files
 %defattr(-,root,root,-)
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/calendar.inc.php
 
 %files -n roundcubemail-plugin-html_converter -f plugin-html_converter.files
 %defattr(-,root,root,-)
 
 %files -n roundcubemail-plugin-kolab_2fa -f plugin-kolab_2fa.files
 %defattr(-,root,root,-)
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/kolab_2fa.inc.php
 
 %files -n roundcubemail-plugin-kolab_activesync -f plugin-kolab_activesync.files
 %defattr(-,root,root,-)
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/kolab_activesync.inc.php
 
 %files -n roundcubemail-plugin-kolab_addressbook -f plugin-kolab_addressbook.files
 %defattr(-,root,root,-)
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/kolab_addressbook.inc.php
 
 %files -n roundcubemail-plugin-kolab_auth -f plugin-kolab_auth.files
 %defattr(-,root,root,-)
-
-%files -n roundcubemail-plugin-kolab_auth_proxy -f plugin-kolab_auth_proxy.files
-%defattr(-,root,root,-)
-
-%files -n roundcubemail-plugin-kolab_chat -f plugin-kolab_chat.files
-%defattr(-,root,root,-)
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/kolab_auth.inc.php
 
 %files -n roundcubemail-plugin-kolab_config -f plugin-kolab_config.files
 %defattr(-,root,root,-)
 
 %files -n roundcubemail-plugin-kolab_delegation -f plugin-kolab_delegation.files
 %defattr(-,root,root,-)
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/kolab_delegation.inc.php
 
 %files -n roundcubemail-plugin-kolab_files -f plugin-kolab_files.files
 %defattr(-,root,root,-)
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/kolab_files.inc.php
 
 %files -n roundcubemail-plugin-kolab_folders -f plugin-kolab_folders.files
 %defattr(-,root,root,-)
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/kolab_folders.inc.php
 
 %files -n roundcubemail-plugin-kolab_notes -f plugin-kolab_notes.files
 %defattr(-,root,root,-)
@@ -2533,26 +1825,26 @@
 %files -n roundcubemail-plugin-kolab_shortcuts -f plugin-kolab_shortcuts.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_sso -f plugin-kolab_sso.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-kolab_tags -f plugin-kolab_tags.files
 %defattr(-,root,root,-)
 
 %files -n roundcubemail-plugin-ldap_authentication -f plugin-ldap_authentication.files
 %defattr(-,root,root,-)
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/ldap_authentication.inc.php
 
 %files -n roundcubemail-plugin-libcalendaring -f plugin-libcalendaring.files
 %defattr(-,root,root,-)
 
 %files -n roundcubemail-plugin-libkolab -f plugin-libkolab.files
 %defattr(-,root,root,-)
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/libkolab.inc.php
 
 %files -n roundcubemail-plugin-loginfail -f plugin-loginfail.files
 %defattr(-,root,root,-)
 
 %files -n roundcubemail-plugin-logon_page -f plugin-logon_page.files
 %defattr(-,root,root,-)
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/logon_page.html
 
 %files -n roundcubemail-plugin-odfviewer -f plugin-odfviewer.files
 %defattr(-,root,root,-)
@@ -2562,22 +1854,22 @@
 
 %files -n roundcubemail-plugin-piwik_analytics -f plugin-piwik_analytics.files
 %defattr(-,root,root,-)
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/piwik_analytics.inc.php
 
 %files -n roundcubemail-plugin-tasklist -f plugin-tasklist.files
 %defattr(-,root,root,-)
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/tasklist.inc.php
 
 %files -n roundcubemail-plugin-tinymce_config -f plugin-tinymce_config.files
 %defattr(-,root,root,-)
 
 %files -n roundcubemail-plugin-wap_client -f plugin-wap_client.files
 %defattr(-,root,root,-)
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/wap_client.inc.php
 
 %files -n roundcubemail-plugin-calendar-assets -f plugin-calendar-assets.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-html_converter-assets -f plugin-html_converter-assets.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-kolab_2fa-assets -f plugin-kolab_2fa-assets.files
 %defattr(-,root,root,-)
 
@@ -2590,12 +1882,6 @@
 %files -n roundcubemail-plugin-kolab_auth-assets -f plugin-kolab_auth-assets.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_auth_proxy-assets -f plugin-kolab_auth_proxy-assets.files
-%defattr(-,root,root,-)
-
-%files -n roundcubemail-plugin-kolab_chat-assets -f plugin-kolab_chat-assets.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-kolab_config-assets -f plugin-kolab_config-assets.files
 %defattr(-,root,root,-)
 
@@ -2614,9 +1900,6 @@
 %files -n roundcubemail-plugin-kolab_shortcuts-assets -f plugin-kolab_shortcuts-assets.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_sso-assets -f plugin-kolab_sso-assets.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-kolab_tags-assets -f plugin-kolab_tags-assets.files
 %defattr(-,root,root,-)
 
@@ -2650,254 +1933,91 @@
 %files -n roundcubemail-plugin-tinymce_config-assets -f plugin-tinymce_config-assets.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-wap_client-assets -f plugin-wap_client-assets.files
-%defattr(-,root,root,-)
-
-%files -n roundcubemail-plugin-calendar-skin-elastic -f plugin-calendar-skin-elastic.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-calendar-skin-larry -f plugin-calendar-skin-larry.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_2fa-skin-elastic -f plugin-kolab_2fa-skin-elastic.files
+%files -n roundcubemail-plugin-calendar-skin-classic -f plugin-calendar-skin-classic.files
 %defattr(-,root,root,-)
 
 %files -n roundcubemail-plugin-kolab_2fa-skin-larry -f plugin-kolab_2fa-skin-larry.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_activesync-skin-elastic -f plugin-kolab_activesync-skin-elastic.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-kolab_activesync-skin-larry -f plugin-kolab_activesync-skin-larry.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_addressbook-skin-elastic -f plugin-kolab_addressbook-skin-elastic.files
+%files -n roundcubemail-plugin-kolab_activesync-skin-classic -f plugin-kolab_activesync-skin-classic.files
 %defattr(-,root,root,-)
 
 %files -n roundcubemail-plugin-kolab_addressbook-skin-larry -f plugin-kolab_addressbook-skin-larry.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_chat-skin-elastic -f plugin-kolab_chat-skin-elastic.files
-%defattr(-,root,root,-)
-
-%files -n roundcubemail-plugin-kolab_chat-skin-larry -f plugin-kolab_chat-skin-larry.files
-%defattr(-,root,root,-)
-
-%files -n roundcubemail-plugin-kolab_delegation-skin-elastic -f plugin-kolab_delegation-skin-elastic.files
+%files -n roundcubemail-plugin-kolab_addressbook-skin-classic -f plugin-kolab_addressbook-skin-classic.files
 %defattr(-,root,root,-)
 
 %files -n roundcubemail-plugin-kolab_delegation-skin-larry -f plugin-kolab_delegation-skin-larry.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_files-skin-elastic -f plugin-kolab_files-skin-elastic.files
+%files -n roundcubemail-plugin-kolab_delegation-skin-classic -f plugin-kolab_delegation-skin-classic.files
 %defattr(-,root,root,-)
 
 %files -n roundcubemail-plugin-kolab_files-skin-larry -f plugin-kolab_files-skin-larry.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_notes-skin-elastic -f plugin-kolab_notes-skin-elastic.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-kolab_notes-skin-larry -f plugin-kolab_notes-skin-larry.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_tags-skin-elastic -f plugin-kolab_tags-skin-elastic.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-kolab_tags-skin-larry -f plugin-kolab_tags-skin-larry.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-libcalendaring-skin-larry -f plugin-libcalendaring-skin-larry.files
-%defattr(-,root,root,-)
-
-%files -n roundcubemail-plugin-libkolab-skin-elastic -f plugin-libkolab-skin-elastic.files
-%defattr(-,root,root,-)
-
-%files -n roundcubemail-plugin-libkolab-skin-larry -f plugin-libkolab-skin-larry.files
-%defattr(-,root,root,-)
-
-%files -n roundcubemail-plugin-tasklist-skin-elastic -f plugin-tasklist-skin-elastic.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-tasklist-skin-larry -f plugin-tasklist-skin-larry.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-calendar-skin-elastic-assets -f plugin-calendar-skin-elastic-assets.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-calendar-skin-larry-assets -f plugin-calendar-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_2fa-skin-elastic-assets -f plugin-kolab_2fa-skin-elastic-assets.files
+%files -n roundcubemail-plugin-calendar-skin-classic-assets -f plugin-calendar-skin-classic-assets.files
 %defattr(-,root,root,-)
 
 %files -n roundcubemail-plugin-kolab_2fa-skin-larry-assets -f plugin-kolab_2fa-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_activesync-skin-elastic-assets -f plugin-kolab_activesync-skin-elastic-assets.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-kolab_activesync-skin-larry-assets -f plugin-kolab_activesync-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_addressbook-skin-elastic-assets -f plugin-kolab_addressbook-skin-elastic-assets.files
+%files -n roundcubemail-plugin-kolab_activesync-skin-classic-assets -f plugin-kolab_activesync-skin-classic-assets.files
 %defattr(-,root,root,-)
 
 %files -n roundcubemail-plugin-kolab_addressbook-skin-larry-assets -f plugin-kolab_addressbook-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_chat-skin-elastic-assets -f plugin-kolab_chat-skin-elastic-assets.files
-%defattr(-,root,root,-)
-
-%files -n roundcubemail-plugin-kolab_chat-skin-larry-assets -f plugin-kolab_chat-skin-larry-assets.files
-%defattr(-,root,root,-)
-
-%files -n roundcubemail-plugin-kolab_delegation-skin-elastic-assets -f plugin-kolab_delegation-skin-elastic-assets.files
+%files -n roundcubemail-plugin-kolab_addressbook-skin-classic-assets -f plugin-kolab_addressbook-skin-classic-assets.files
 %defattr(-,root,root,-)
 
 %files -n roundcubemail-plugin-kolab_delegation-skin-larry-assets -f plugin-kolab_delegation-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_files-skin-elastic-assets -f plugin-kolab_files-skin-elastic-assets.files
+%files -n roundcubemail-plugin-kolab_delegation-skin-classic-assets -f plugin-kolab_delegation-skin-classic-assets.files
 %defattr(-,root,root,-)
 
 %files -n roundcubemail-plugin-kolab_files-skin-larry-assets -f plugin-kolab_files-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_notes-skin-elastic-assets -f plugin-kolab_notes-skin-elastic-assets.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-kolab_notes-skin-larry-assets -f plugin-kolab_notes-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_tags-skin-elastic-assets -f plugin-kolab_tags-skin-elastic-assets.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-kolab_tags-skin-larry-assets -f plugin-kolab_tags-skin-larry-assets.files
 %defattr(-,root,root,-)
 
 %files -n roundcubemail-plugin-libcalendaring-skin-larry-assets -f plugin-libcalendaring-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-libkolab-skin-elastic-assets -f plugin-libkolab-skin-elastic-assets.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-libkolab-skin-larry-assets -f plugin-libkolab-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-tasklist-skin-elastic-assets -f plugin-tasklist-skin-elastic-assets.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-tasklist-skin-larry-assets -f plugin-tasklist-skin-larry-assets.files
 %defattr(-,root,root,-)
 
 %changelog
-* Wed Nov 17 2021 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 3.5.10-1
-- Release of version 3.5.10
-
-* Fri Oct  1 2021 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 3.5.9-1
-- Release of version 3.5.9
-
-* Wed Sep  1 2021 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 3.5.8-1
-- Release of version 3.5.8
-
-* Fri Oct 16 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.5.5-1
-- Release of version 3.5.5
-
-* Mon Jul  6 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.5.4-3
-- Bump release for rebuild
-
-* Mon Mar  2 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.5.4-1
-- Release of version 3.5.4
-
-* Thu Dec  5 2019 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.5.3-1
-- Release of version 3.5.3
-
-* Sat Oct 19 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.5.2-1
-- Release of version 3.5.2
-
-* Mon Oct  7 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.5.1-1
-- Release of version 3.5.1
-
-* Fri Aug 16 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.5.0-2
-- Fix setting 'fileid' on file objects (Bifrost#T227815)
-
-* Mon Jul  1 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.5.0-1
-- Release of version 3.5.0
-
-* Mon Jun  3 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.6-1
-- Release of version 3.4.6
-
-* Wed May 15 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.5-4
-- Rebuild against core updates
-
-* Tue May  7 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.5-1
-- Release of version 3.4.5
-
-* Fri Apr 19 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.4-2
-- Fix Free/Busy URL
-
-* Mon Apr 15 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.4-1
-- Release of version 3.4.4
-
-* Thu Mar 28 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.3-3
-- Fix literal in calendar name event
-- Fix calendar event attendee change regression
-- Fix invalid time error on formats without a leading zero
-
-* Thu Mar 14 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.3-1
-- Release of version 3.4.3
-
-* Sun Jan 27 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.2-2
-- Fix de_DE, save buttons
-
-* Sat Jan 19 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.2-1
-- Release of version 3.4.2
-
-* Thu Dec  6 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.1-1
-- Release of version 3.4.1
-
-* Mon Dec  3 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.0-2
-- Fix default folder configuration on Plesk to align with the core default folder configuration.
-
-* Thu Nov 22 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.0-1
-- Release of version 3.4.0
-
-* Mon Oct 29 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-54.beta1
-- New snapshot
-- Rebuild against core updates
-
-* Sat Aug 18 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-39.alpha8
-- New snapshot
-- Fix per_user_logging
-
-* Tue May 29 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-34.alpha6
-- Ship a pre-release version of the Elastic skin
-
-* Tue May 22 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-33.alpha5
-- Ship a pre-release version of the Elastic skin
-
-* Wed May 16 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-16.alpha4
-- Ship a pre-release version of the Elastic skin
-
-* Tue May 15 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-31.alpha4
-- Ship a pre-release version of the Elastic skin
-
-* Mon May 14 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-18.alpha4
-- Ship a pre-release version of the Elastic skin
-
-* Mon Apr 30 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-16.alpha2
-- Ship a pre-release version of the Elastic skin
-
-* Wed Apr 25 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-14.alpha1
-- Ship a pre-release version of the Elastic skin
-
-* Thu Apr 12 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-12.alpha0
-- Ship a pre-release version of the Elastic skin
-
-* Fri Jan  5 2018 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.3.5-2
-- Repack of 3.3.5
-
 * Tue Nov 28 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.3.5-1
 - Release of version 3.3.5

roundcubemail-plugins-kolab-3.3-kolab-files-manticore-api.patch Added

roundcubemail-plugins-kolab-3.4-kolab-files-manticore-api.patch Deleted

debian.changelog Changed

@@ -1,218 +1,3 @@
-roundcubemail-plugins-kolab (1:3.5.11-0~kolab1) unstable; urgency=low
-
-  * Release version 3.5.11
-
- -- Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch>  Fri, 14 Jan 2022 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.5.10-0~kolab1) unstable; urgency=low
-
-  * Release version 3.5.10
-
- -- Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch>  Wed, 17 Nov 2021 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.5.9-0~kolab1) unstable; urgency=low
-
-  * Release version 3.5.9
-
- -- Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch>  Fri,  1 Oct 2021 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.5.8-0~kolab1) unstable; urgency=low
-
-  * Release version 3.5.8
-
- -- Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch>  Wed,  1 Sep 2021 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.5.6-0~kolab1) unstable; urgency=low
-
-  * Release version 3.5.6
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 12 Apr 2021 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.5.5-0~kolab2) unstable; urgency=low
-
-  * Release version 3.5.5
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 16 Oct 2020 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.5.4-0~kolab4) unstable; urgency=low
-
-  * Bump release for rebuild
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon,  6 Jul 2020 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.5.4-0~kolab2) unstable; urgency=low
-
-  * Release version 3.5.4
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon,  2 Mar 2020 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.5.3-0~kolab5) unstable; urgency=low
-
-  * Require virtual provides for php-bindings
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Tue, 14 Jan 2020 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.5.3-0~kolab3) unstable; urgency=low
-
-  * Re-introduce postinst scripts for calling updatedb.sh
-
- -- Christoph Erhardt <kolab@sicherha.de>  Mon, 06 Jan 2020 20:48:30 +0100
-
-roundcubemail-plugins-kolab (1:3.5.3-0~kolab2) unstable; urgency=low
-
-  * Release version 3.5.3
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  5 Dec 2019 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.5.2-0~kolab2) unstable; urgency=low
-
-  * Release version 3.5.2
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sat, 19 Oct 2019 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.5.1-0~kolab2) unstable; urgency=low
-
-  * Release version 3.5.1
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon,  7 Oct 2019 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.5.0-0~kolab5) unstable; urgency=low
-
-  * Fix setting 'fileid' on file objects (Bifrost#T227815)
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 16 Aug 2019 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.5.0-0~kolab2) unstable; urgency=low
-
-  * Release of version 3.5.0
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon,  1 Jul 2019 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4.6-0~kolab2) unstable; urgency=low
-
-  * Release of version 3.4.6
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon,  3 Jun 2019 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4.5-0~kolab5) unstable; urgency=low
-
-  * Rebuild against core updates
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 15 May 2019 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4.5-0~kolab1) unstable; urgency=low
-
-  * Release of version 3.4.5
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue,  7 May 2019 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4.4-0~kolab2) unstable; urgency=low
-
-  * Release of version 3.4.4
-  * Correct freebusy URL
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 19 Apr 2019 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4.3-0~kolab3) unstable; urgency=low
-
-  * Fix invalid time error on formats without a leading zero
-  * Fix calendar event attendee change regression
-  * Fix literal in calendar name event
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 28 Mar 2019 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4.3-0~kolab1) unstable; urgency=low
-
-  * Release of version 3.4.3
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 14 Mar 2019 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4.2-0~kolab2) unstable; urgency=low
-
-  * Fix de_DE, save button
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sun, 27 Jan 2019 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4.2-0~kolab1) unstable; urgency=low
-
-  * Release of version 3.4.2
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sat, 19 Jan 2019 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4.1-0~kolab1) unstable; urgency=low
-
-  * Release of version 3.4.1
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  6 Dec 2018 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4.0-0~kolab2) unstable; urgency=low
-
-  * Fix default folder configuration on Plesk, to align with core configuration
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon,  3 Dec 2018 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4.0-0~kolab1) unstable; urgency=low
-
-  * Release version 3.4.0
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 22 Nov 2018 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4-0~kolab57) unstable; urgency=low
-
-  * Rebuild against core skin updates
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 29 Oct 2018 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4-0~kolab55) unstable; urgency=low
-
-  * New snapshot
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 24 Oct 2018 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4-0~kolab39) unstable; urgency=low
-
-  * New snapshot
-  * Fix per user logging
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sat, 18 Aug 2018 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4-0~kolab38) unstable; urgency=low
-
-  * Rebuild against core elastic update
-  * Ship a preliminary chat integration plugin
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 12 Jul 2018 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4-0~kolab4) unstable; urgency=low
-
-  * Rebuild against core elastic update
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue,  5 Jun 2018 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4-0~kolab3) unstable; urgency=low
-
-  * Release 3.4 pre-alpha
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 29 May 2018 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4-0~kolab2) unstable; urgency=low
-
-  * Release 3.4 pre-alpha
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 22 May 2018 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.4-0~kolab1) unstable; urgency=low
-
-  * Release 3.4 pre-alpha
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 10 Apr 2018 11:11:11 +0200
-
-roundcubemail-plugins-kolab (1:3.3.5-0~kolab2) unstable; urgency=low
-
-  * Release 3.3.5
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri,  5 Jan 2018 11:11:11 +0200
-
 roundcubemail-plugins-kolab (1:3.3.5-0~kolab1) unstable; urgency=low
 
   * Release 3.3.5

debian.control Changed

@@ -1,9 +1,9 @@
 Source: roundcubemail-plugins-kolab
 Section: web
 Priority: extra
-Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
-Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
-Build-Depends: cssmin, debhelper (>= 8), node-less, node-uglify, roundcubemail-core (>= 1.4), psa | bash
+Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
+Uploaders: Paul Klos <kolab@klos2day.nl>
+Build-Depends: cssmin, debhelper (>= 8), node-uglify, psa | bash
 Standards-Version: 3.9.3
 Vcs-Git: git://git.kolabsys.com/git/apt/roundcube-plugins-kolab
 Vcs-Browser: http://git.kolabsys.com/apt/roundcube-plugins-kolab.git
@@ -14,8 +14,8 @@
             php-http-request2,
             php-net-url2,
             php-cli | php5-cli,
-            php-bindings-libkolab,
-            php-bindings-libkolabxml,
+            php-kolab (>= 0.5),
+            php-kolabformat (>= 1.1),
             php-mail-mime (>= 1.8.5),
             php-net-ldap3,
             roundcubemail-plugin-calendar,
@@ -103,20 +103,6 @@
 Replaces: roundcubemail-plugins-kolab (<< 1:3.3.0-1~kolab1)
 Description: kolab_auth plugin for Roundcube
 
-Package: roundcubemail-plugin-kolab-auth-proxy
-Architecture: all
-Depends: roundcubemail-plugin-kolab-auth
-Breaks: roundcubemail-plugins-kolab (<< 1:3.4.3-1~kolab1)
-Replaces: roundcubemail-plugins-kolab (<< 1:3.4.3-1~kolab1)
-Description: kolab_auth_proxy plugin for Roundcube
-
-Package: roundcubemail-plugin-kolab-chat
-Architecture: all
-Depends: roundcubemail-core
-Breaks: roundcubemail-plugins-kolab (<< 1:3.3.0-1~kolab1)
-Replaces: roundcubemail-plugins-kolab (<< 1:3.3.0-1~kolab1)
-Description: kolab_chat plugin for Roundcube
-
 Package: roundcubemail-plugin-kolab-config
 Architecture: all
 Depends: roundcubemail-core,
@@ -160,13 +146,10 @@
 Replaces: roundcubemail-plugins-kolab (<< 1:3.3.0-1~kolab1)
 Description: kolab_notes plugin for Roundcube
 
-Package: roundcubemail-plugin-kolab-sso
+Package: roundcubemail-plugin-kolab-shortcuts
 Architecture: all
-Depends: roundcubemail-core,
-         roundcubemail-plugin-kolab-auth
-Breaks: roundcubemail-plugins-kolab (<< 1:3.4.3-1~kolab1)
-Replaces: roundcubemail-plugins-kolab (<< 1:3.4.3-1~kolab1)
-Description: kolab_sso plugin for Roundcube
+Depends: roundcubemail-core
+Description: kolab_shortcuts plugin for Roundcube
 
 Package: roundcubemail-plugin-kolab-tags
 Architecture: all

debian.rules Changed

@@ -11,20 +11,6 @@
 	find plugins -type d -name helpdocs -exec rm -rvf {} \; 2>/dev/null || :
 	find plugins -type d -name tests -exec rm -rvf {} \; 2>/dev/null || :
 
-	ls -l $(CURDIR)
-	mkdir -p $(CURDIR)/skins
-	cp -avf /usr/share/roundcubemail/skins/elastic/ $(CURDIR)/skins/.
-
-	# Compile the CSS
-	for file in `find $(CURDIR) -type f -name "styles.less" -o -name "print.less" -o -name "embed.less" -o -name "libkolab.less"`; do \
-		lessc --relative-urls $${file} > $$(dirname $${file})/$$(basename $${file} .less).css ; \
-		sed -i \
-			-e "s|../../../skins/elastic/images/contactpic.png|../../../../skins/elastic/images/contactpic.png|" \
-			-e "s|../../../skins/elastic/images/watermark.jpg|../../../../skins/elastic/images/watermark.jpg|" \
-			$$(dirname $${file})/$$(basename $${file} .less).css ; \
-	done
-
-
 	# Compress the CSS
 	for file in `find $(CURDIR) -type f -name "*.css"`; do \
 		asset_loc=$$(dirname $$(echo $${file} | sed \
@@ -33,7 +19,9 @@
 			) ; \
 		echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \
 		mkdir -p $${asset_loc} ; \
-		cat $${file} | cssmin > $${asset_loc}/$$(basename $${file}) ; \
+		cat $${file} | cssmin > $${asset_loc}/$$(basename $${file}) && \
+			rm -rvf $${file} || \
+			mv -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
 	done
 
 	# Compress the JS, but not the already minified
@@ -44,7 +32,9 @@
 			) ; \
 		echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \
 		mkdir -p $${asset_loc} ; \
-		uglifyjs $${file} > $${asset_loc}/$$(basename $${file}) ; \
+		uglifyjs $${file} > $${asset_loc}/$$(basename $${file}) && \
+			rm -rvf $${file} || \
+			mv -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
 	done
 
 	# The already minied JS can just be copied over to the assets location
@@ -54,7 +44,7 @@
 				-e "s|$(CURDIR)/plugins/$${plugin}/skins/|$(CURDIR)/public_html/assets/plugins/$${plugin}/skins/|g") ; \
 			) ; \
 		mkdir -p $${asset_loc} ; \
-		cp -avf $${file} $${asset_loc}/$$(basename $${file}) ; \
+		mv -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
 	done
 
 	# Other assets
@@ -99,7 +89,6 @@
 	if [ -f "/etc/plesk-release" ]; then \
 		cp -v ../SOURCES/plesk.calendar.inc.php config/calendar.inc.php ; \
 		cp -v ../SOURCES/plesk.kolab_addressbook.inc.php config/kolab_addressbook.inc.php ; \
-		cp -v ../SOURCES/plesk.kolab_chat.inc.php config/kolab_chat.inc.php ; \
 		cp -v ../SOURCES/plesk.kolab_folders.inc.php config/kolab_folders.inc.php ; \
 		cp -v ../SOURCES/plesk.libkolab.inc.php config/libkolab.inc.php ; \
 	fi
@@ -108,30 +97,3 @@
 
 override_dh_compress:
 	dh_compress -Xsql
-
-override_dh_auto_install:
-	for plugin in `find $(CURDIR)/plugins/ -type d -mindepth 1 -maxdepth 1 -exec basename {} \;)`; do \
-		pkgname=$$(echo $${plugin} | sed -e 's/_/-/g') ; \
-		if [ -z "$$(find $(CURDIR)/plugins/$${plugin} -type d -name SQL)" ]; then \
-			continue ; \
-		fi ; \
-		( \
-			echo "#!/bin/sh" ; \
-			echo "" ; \
-			echo "for dir in \$$(find /usr/share/roundcubemail/plugins/$${plugin}/ -type d -name SQL); do" ; \
-			echo "    # Skip plugins with multiple drivers and no kolab driver" ; \
-			echo "    if [ ! -z \"\$$(echo \$${dir} | grep driver)\" ]; then" ; \
-			echo "        if [ -z \"\$$(echo \$${dir} | grep kolab)\" ]; then" ; \
-			echo "            continue" ; \
-			echo "        fi" ; \
-			echo "    fi" ; \
-			echo "" ; \
-			echo "    /usr/share/roundcubemail/bin/updatedb.sh \\" ; \
-			echo "        --dir \$${dir} \\" ; \
-			echo "        --package $${plugin} \\" ; \
-			echo "        >/dev/null 2>&1 || :" ; \
-			echo "" ; \
-			echo "done" ; \
-		) > $(CURDIR)/debian/roundcubemail-plugin-$${pkgname}.postinst ; \
-	done
-	dh_auto_install

debian.series Changed

plesk.kolab_chat.inc.php Deleted

plesk.kolab_folders.inc.php Changed

plesk.libkolab.inc.php Changed

roundcubemail-plugins-kolab-3.5.11.tar.gz -> roundcubemail-plugins-kolab-3.3.5.tar.gz Changed

roundcubemail-plugins-kolab.dsc Changed

@@ -2,11 +2,11 @@
 Source: roundcubemail-plugins-kolab
 Binary: roundcubemail-plugins-kolab
 Architecture: all
-Version: 1:3.5.11-0~kolab1
-Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
-Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
+Version: 1:3.3.5-0~kolab1
+Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
+Uploaders: Paul Klos <kolab@klos2day.nl>
 Standards-Version: 3.9.3
-Build-Depends: cssmin, debhelper (>= 8), node-less, node-uglify, roundcubemail-core (>= 1.4), psa | bash
+Build-Depends: cssmin, debhelper (>= 8), node-uglify, psa | bash
 Package-List:
  roundcubemail-plugins-kolab deb web extra
  roundcubemail-plugin-calendar deb web extra
@@ -15,15 +15,12 @@
  roundcubemail-plugin-kolab-activesync deb web extra
  roundcubemail-plugin-kolab-addressbook deb web extra
  roundcubemail-plugin-kolab-auth deb web extra
- roundcubemail-plugin-kolab-auth-proxy deb web extra
- roundcubemail-plugin-kolab-chat deb web extra
  roundcubemail-plugin-kolab-config deb web extra
  roundcubemail-plugin-kolab-delegation deb web extra
  roundcubemail-plugin-kolab-files deb web extra
  roundcubemail-plugin-kolab-folders deb web extra
  roundcubemail-plugin-kolab-notes deb web extra
  roundcubemail-plugin-kolab-shortcuts deb web extra
- roundcubemail-plugin-kolab-sso deb web extra
  roundcubemail-plugin-kolab-tags deb web extra
  roundcubemail-plugin-ldap-authentication deb web extra
  roundcubemail-plugin-libcalendaring deb web extra
@@ -37,5 +34,5 @@
  roundcubemail-plugin-tinymce-config deb web extra
  roundcubemail-plugin-wap-client deb web extra
 Files:
- 00000000000000000000000000000000 0 roundcubemail-plugins-kolab-3.5.11.tar.gz
+ 00000000000000000000000000000000 0 roundcubemail-plugins-kolab-3.3.5.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

Build Results
RPM Lint

Refresh

Comments for request 2162 0

Request History

vanmeeuwen created request over 6 years ago

Check in release 3.3.5

vanmeeuwen superseded request over 6 years ago

superseded by 2176