Request 1899 (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 1903 (Show diff)

Overview

Request 1899 (superseded)

No description set

Created by dhoffend almost 8 years ago
In state superseded
Superseded by 1903
Open review for Admin
Open review for vanmeeuwen

Submit roundcubemail

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

roundcubemail.spec Changed

@@ -12,8 +12,6 @@
 #!BuildIgnore:  php-mysql
 %endif
 
-%global bootstrap 0
-
 %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
 
 # Needed to reload the webserver if APC is installed/enabled.
@@ -28,16 +26,10 @@
 %global httpd_name apache2
 %global httpd_user wwwrun
 %else
-%if 0%{?plesk}
-%global httpd_group roundcube_sysgroup
-%global httpd_name httpd
-%global httpd_user roundcube_sysuser
-%else
 %global httpd_group apache
 %global httpd_name httpd
 %global httpd_user apache
 %endif
-%endif
 
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
 
@@ -48,15 +40,10 @@
 %global logdir /var/log/roundcubemail
 %global tmpdir /var/lib/roundcubemail
 
-%global rc_version 1.4.15
-#%%global rc_rel_suffix rc2.12
-%global dot_rel_suffix %{?rc_rel_suffix:.%{rc_rel_suffix}}
-%global dash_rel_suffix %{?rc_rel_suffix:-%{rc_rel_suffix}}
-
 Name:           roundcubemail
-Version:        %{rc_version}
+Version:        1.2.3
 
-Release:        1%{?dot_rel_suffix}%{?dist}
+Release:        1%{?dist}
 
 Summary:        Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -64,36 +51,21 @@
 License:        GPLv2
 URL:            http://www.roundcube.net
 
-Source0:        roundcubemail-%{version}%{?dash_rel_suffix}.tar.gz
+Source0:        roundcubemail-%{version}.tar.gz
 Source1:        comm.py
 
 Source20:       roundcubemail.conf
 Source21:       roundcubemail.logrotate
 
-Source100:      plesk.config.inc.php
-Source101:      plesk.managesieve.inc.php
-Source102:      plesk.password.inc.php
-
-Source200:      2017111400.sql
-
 Patch201:       default-configuration.patch
-Patch202:       roundcubemail-1.4-beta86-plugin-enigma-homedir.patch
-Patch203:       0001-Enigma-Optional-support-for-passwordless-keys-7265.patch
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 
 BuildRequires:  composer
-%if 0%{?fedora}
-# fix issue:
-# have choice for php-composer(justinrainbow/json-schema) >= 2.0 needed by composer: php-justinrainbow-json-schema4 php-justinrainbow-json-schema
-# have choice for php-composer(justinrainbow/json-schema) < 5 needed by composer: php-justinrainbow-json-schema4 php-justinrainbow-json-schema php-JsonSchema
-BuildRequires:  php-justinrainbow-json-schema4
-%endif
-
-%if 0%{?plesk} < 1
 BuildRequires:  php-gd
 BuildRequires:  php-mbstring
+BuildRequires:  php-mcrypt
 BuildRequires:  php-pdo
 BuildRequires:  php-pear >= 1.9.0
 BuildRequires:  php-phpunit-PHPUnit
@@ -108,60 +80,30 @@
 BuildRequires:  php-pear(MDB2_Driver_mysqli)
 BuildRequires:  php-pear(Net_IDNA2)
 BuildRequires:  php-pear(Net_LDAP2)
-BuildRequires:  php-kolab-net-ldap3
+BuildRequires:  php-pear(Net_LDAP3)
 BuildRequires:  php-pear(Net_Sieve)
 BuildRequires:  php-pear(Net_SMTP)
 BuildRequires:  php-pear(Net_Socket)
-%endif
-
-%if "%{_arch}" != "ppc64" && "%{_arch}" != "ppc64le"
-BuildRequires:  nodejs-less
-%if 0%{?suse_version} < 1
-BuildRequires:  uglify-js
-%endif
-%else
-BuildRequires:  php-lessphp
-%endif
-
-%if 0%{?rhel} >= 8
-%if "%{_arch}" != "ppc64" && "%{_arch}" != "ppc64le" && 0%{?suse_version} < 1
-BuildRequires:  python%{?python3_pkgversion}-cssmin
-%endif
-
-# This can, regrettably, not be BuildRequires'ed, since the OSC
-# command-line so epicly fails at downloading as large a chunk of data.
-#BuildRequires:  firefox
-BuildRequires:  python%{?python3_pkgversion}
-BuildRequires:  python%{?python3_pkgversion}-nose
-#BuildRequires:  python-selenium
-
-%else
 
 %if "%{_arch}" != "ppc64" && "%{_arch}" != "ppc64le" && 0%{?suse_version} < 1
 BuildRequires:  python-cssmin
+BuildRequires:  uglify-js
 %endif
 
 # This can, regrettably, not be BuildRequires'ed, since the OSC
 # command-line so epicly fails at downloading as large a chunk of data.
 #BuildRequires:  firefox
 BuildRequires:  python
-#BuildRequires:  python-nose
-#BuildRequires:  python-selenium
-
-%endif # %if 0%{?rhel} >= 8
+BuildRequires:  python-nose
+BuildRequires:  python-selenium
 
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%if 0%{?plesk}
-Requires:       %{name}-skin-plesk
-Requires:       %{name}-skin-plesk-larry
-%else
 %if 0%{?kolab_enterprise}
 Requires:       %{name}-skin-enterprise
 %else
 Requires:       %{name}-skin-chameleon
 %endif
-%endif
 
 # Archive and Zipdownload plugins required through
 # being listed in config.inc.php.sample.
@@ -190,14 +132,9 @@
 Requires:       php-common >= 5.3
 %endif
 
-%if 0%{?fedora}
-# to avoid on OBS, for packages depending on roundcubemail-core:
-# have choice for webserver needed by roundcubemail-core: lighttpd httpd nginx cherokee
-Requires:       httpd
-%endif
-
 Requires:       php-gd
 Requires:       php-mbstring
+Requires:       php-mcrypt
 Requires:       php-pear >= 1.9.0
 Requires:       php-xml
 
@@ -208,45 +145,22 @@
 Requires:       php-pear(MDB2) >= 2.5.0
 Requires:       php-pear(MDB2_Driver_mysqli)
 Requires:       php-pear(Net_IDNA2)
+Requires:       php-pear(Net_LDAP2)
+Requires:       php-pear(Net_LDAP3)
 Requires:       php-pear(Net_Sieve)
 Requires:       php-pear(Net_SMTP)
 Requires:       php-pear(Net_Socket)
 
-%if 0%{?plesk} < 1
-Requires:       php-pear(Net_LDAP2)
-Requires:       php-kolab-net-ldap3
-%endif
-
-%if 0%{?plesk}
-%if 0%{?bootstrap} < 1
-Requires:       %{name}(skin-plesk)
-Requires:       %{name}(skin-plesk-larry)
-Requires:       %{name}(skin-plesk-larry-assets)
-%endif
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       %{name}(skin-enterprise)
-Requires:       %{name}(skin-kolab)
-%endif
-%else
-Requires:       %{name}(skin-chameleon)
-Requires:       %{name}(skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%endif
-
 Requires:       %{name}(core-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # The filesystem_attachments plugin is required.
 Requires:       %{name}(plugin-filesystem_attachments) = %{?epoch:%{epoch}:}%{version}-%{release}
 # The jqueryui plugin is required.
 Requires:       %{name}(plugin-jqueryui) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:      %{name}-plugin-legacy_browser < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-legacy_browser) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:      %{name}-plugin-threading_as_default < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}(plugin-threading_as_default}
+Obsoletes:      %{name}-plugin-threading_as_default
 Provides:       %{name}-plugin-threading_as_default = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description core
@@ -266,29 +180,7 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-acl-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-%if 0%{?bootstrap} < 1
-Requires:       %{name}(plugin-acl-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-plesk) >= 0.4
-Requires:       %{name}(skin-plesk-larry) >= 0.3
-Requires:       %{name}(plugin-acl-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       %{name}(skin-enterprise) >= 0.3.7
-Requires:       %{name}(skin-kolab) >= 0.4
-%endif
-Requires:       %{name}-plugin-acl-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-acl-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-acl-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-acl-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       %{name}(skin-chameleon) >= 0.3.9
-Requires:       %{name}(plugin-acl-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-acl-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%endif
+Requires:       %{name}(plugin-acl-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-acl) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-acl
@@ -299,10 +191,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-additional_message_headers-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-additional_message_headers-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-additional_message_headers-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-additional_message_headers-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-additional_message_headers-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-additional_message_headers) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-additional_message_headers
@@ -313,10 +201,7 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-archive-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-archive-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-archive-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-archive-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-archive-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-archive-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-archive) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-archive
@@ -327,10 +212,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-attachment_reminder-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-attachment_reminder-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-attachment_reminder-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-attachment_reminder-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-attachment_reminder-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-attachment_reminder) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-attachment_reminder
@@ -341,10 +222,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-autologon-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-autologon-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-autologon-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-autologon-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-autologon-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-autologon) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-autologon
@@ -355,10 +232,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-database_attachments-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-database_attachments-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-database_attachments-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-database_attachments-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-database_attachments-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-database_attachments) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-database_attachments
@@ -369,10 +242,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-debug_logger-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-debug_logger-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-debug_logger-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-debug_logger-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-debug_logger-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-debug_logger) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-debug_logger
@@ -383,10 +252,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-emoticons-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-emoticons-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-emoticons-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-emoticons-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-emoticons-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-emoticons) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-emoticons
@@ -397,30 +262,7 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-enigma-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       php-pear-crypt-gpg
-%if 0%{?plesk}
-%if 0%{?bootstrap} < 1
-Requires:       %{name}(plugin-enigma-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-plesk) >= 0.4
-Requires:       %{name}(skin-plesk-larry) >= 0.3
-Requires:       %{name}(plugin-enigma-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       %{name}(skin-enterprise) >= 0.3.7
-Requires:       %{name}(skin-kolab) >= 0.4
-%endif
-Requires:       %{name}-plugin-enigma-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-enigma-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-enigma-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-enigma-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       %{name}(skin-chameleon) >= 0.3.9
-Requires:       %{name}(plugin-enigma-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-enigma-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%endif
+Requires:       %{name}(plugin-enigma-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-enigma) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-enigma
@@ -431,10 +273,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-example_addressbook-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-example_addressbook-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-example_addressbook-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-example_addressbook-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-example_addressbook-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-example_addressbook) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-example_addressbook
@@ -445,10 +283,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-filesystem_attachments-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-filesystem_attachments-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-filesystem_attachments-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-filesystem_attachments-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-filesystem_attachments-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-filesystem_attachments) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-filesystem_attachments
@@ -459,29 +293,7 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-help-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-%if 0%{?bootstrap} < 1
-Requires:       %{name}(plugin-help-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-plesk) >= 0.4
-Requires:       %{name}(skin-plesk-larry) >= 0.3
-Requires:       %{name}(plugin-help-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       %{name}(skin-enterprise) >= 0.3.7
-Requires:       %{name}(skin-kolab) >= 0.4
-%endif
-Requires:       %{name}-plugin-help-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-help-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-help-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-help-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       %{name}(skin-chameleon) >= 0.3.9
-Requires:       %{name}(plugin-help-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-help-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%endif
+Requires:       %{name}(plugin-help-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-help) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-help
@@ -492,30 +304,7 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-hide_blockquote-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-%if 0%{?bootstrap} < 1
-Obsoletes:      %{name}-plugin-hide_blockquote-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-hide_blockquote-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-plesk) >= 0.4
-Requires:       %{name}(skin-plesk-larry) >= 0.3
-Requires:       %{name}(plugin-hide_blockquote-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       %{name}(skin-enterprise) >= 0.3.7
-Requires:       %{name}(skin-kolab) >= 0.4
-%endif
-Obsoletes:      %{name}-plugin-hide_blockquote-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-hide_blockquote-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-hide_blockquote-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-hide_blockquote-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       %{name}(skin-chameleon) >= 0.3.9
-Obsoletes:      %{name}-plugin-hide_blockquote-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-hide_blockquote-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%endif
+Requires:       %{name}(plugin-hide_blockquote-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-hide_blockquote) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-hide_blockquote
@@ -526,38 +315,16 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-http_authentication-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-http_authentication-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-http_authentication-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-http_authentication-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-http_authentication-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-http_authentication) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-http_authentication
 Plugin http_authentication
 
-%package plugin-identicon
-Summary:        Plugin identicon
-Group:          Applications/Internet
-Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-identicon-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-identicon-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-identicon-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-identicon-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-identicon-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-identicon) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-identicon
-Plugin identicon
-
 %package plugin-identity_select
 Summary:        Plugin identity_select
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-identity_select-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-identity_select-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-identity_select-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-identity_select-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-identity_select-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-identity_select) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-identity_select
@@ -568,29 +335,7 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-jqueryui-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-%if 0%{?bootstrap} < 1
-Requires:       %{name}(plugin-jqueryui-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-plesk) >= 0.4
-Requires:       %{name}(skin-plesk-larry) >= 0.3
-Requires:       %{name}(plugin-jqueryui-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       %{name}(skin-enterprise) >= 0.3.7
-Requires:       %{name}(skin-kolab) >= 0.4
-%endif
-Requires:       %{name}-plugin-jqueryui-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-jqueryui-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-jqueryui-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-jqueryui-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       %{name}(skin-chameleon) >= 0.3.9
-Requires:       %{name}(plugin-jqueryui-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-jqueryui-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%endif
+Requires:       %{name}(plugin-jqueryui-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-jqueryui) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-jqueryui
@@ -601,43 +346,28 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-krb_authentication-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-krb_authentication-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-krb_authentication-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-krb_authentication-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-krb_authentication-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-krb_authentication) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-krb_authentication
 Plugin krb_authentication
 
+%package plugin-legacy_browser
+Summary:        Plugin legacy_browser
+Group:          Applications/Internet
+Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-legacy_browser-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-legacy_browser-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-legacy_browser) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-legacy_browser
+Plugin legacy_browser
+
 %package plugin-managesieve
 Summary:        Plugin managesieve
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-managesieve-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-%if 0%{?bootstrap} < 1
-Requires:       %{name}(plugin-managesieve-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-plesk) >= 0.4
-Requires:       %{name}(skin-plesk-larry) >= 0.3
-Requires:       %{name}(plugin-managesieve-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       %{name}(skin-enterprise) >= 0.3.7
-Requires:       %{name}(skin-kolab) >= 0.4
-%endif
-Requires:       %{name}-plugin-managesieve-skin-elastic = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-managesieve-skin-elastic-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-managesieve-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-managesieve-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       %{name}(skin-chameleon) >= 0.3.9
-Requires:       %{name}(plugin-managesieve-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-managesieve-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%endif
+Requires:       %{name}(plugin-managesieve-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-managesieve) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-managesieve
@@ -648,30 +378,7 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-markasjunk-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-%if 0%{?bootstrap} < 1
-Obsoletes:      %{name}-plugin-markasjunk-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-markasjunk-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-plesk) >= 0.4
-Requires:       %{name}(skin-plesk-larry) >= 0.3
-Requires:       %{name}(plugin-markasjunk-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       %{name}(skin-enterprise) >= 0.3.7
-Requires:       %{name}(skin-kolab) >= 0.4
-%endif
-Obsoletes:      %{name}-plugin-markasjunk-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-markasjunk-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-markasjunk-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-markasjunk-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       %{name}(skin-chameleon) >= 0.3.9
-Obsoletes:      %{name}-plugin-markasjunk-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-markasjunk-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%endif
+Requires:       %{name}(plugin-markasjunk-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-markasjunk) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-markasjunk
@@ -682,10 +389,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-new_user_dialog-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-new_user_dialog-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-new_user_dialog-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-new_user_dialog-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-new_user_dialog-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-new_user_dialog) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-new_user_dialog
@@ -696,10 +399,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-new_user_identity-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-new_user_identity-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-new_user_identity-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-new_user_identity-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-new_user_identity-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-new_user_identity) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-new_user_identity
@@ -710,10 +409,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-newmail_notifier-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-newmail_notifier-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-newmail_notifier-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-newmail_notifier-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-newmail_notifier-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-newmail_notifier) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-newmail_notifier
@@ -724,10 +419,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-password-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-password-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-password-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-password-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-password-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-password) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-password
@@ -738,10 +429,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-redundant_attachments-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-redundant_attachments-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-redundant_attachments-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-redundant_attachments-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-redundant_attachments-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-redundant_attachments) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-redundant_attachments
@@ -752,10 +439,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-show_additional_headers-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-show_additional_headers-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-show_additional_headers-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-show_additional_headers-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-show_additional_headers-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-show_additional_headers) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-show_additional_headers
@@ -766,10 +449,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-squirrelmail_usercopy-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-squirrelmail_usercopy-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-squirrelmail_usercopy-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-squirrelmail_usercopy-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-squirrelmail_usercopy-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-squirrelmail_usercopy) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-squirrelmail_usercopy
@@ -780,10 +459,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-subscriptions_option-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-subscriptions_option-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-subscriptions_option-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-subscriptions_option-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-subscriptions_option-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-subscriptions_option) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-subscriptions_option
@@ -794,10 +469,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-userinfo-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-userinfo-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-userinfo-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-userinfo-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-userinfo-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-userinfo) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-userinfo
@@ -808,30 +479,7 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-vcard_attachments-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-%if 0%{?bootstrap} < 1
-Obsoletes:      %{name}-plugin-vcard_attachments-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-vcard_attachments-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-plesk) >= 0.4
-Requires:       %{name}(skin-plesk-larry) >= 0.3
-Requires:       %{name}(plugin-vcard_attachments-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       %{name}(skin-enterprise) >= 0.3.7
-Requires:       %{name}(skin-kolab) >= 0.4
-%endif
-Obsoletes:      %{name}-plugin-vcard_attachments-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-vcard_attachments-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-vcard_attachments-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-vcard_attachments-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       %{name}(skin-chameleon) >= 0.3.9
-Obsoletes:      %{name}-plugin-vcard_attachments-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-vcard_attachments-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%endif
+Requires:       %{name}(plugin-vcard_attachments-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-vcard_attachments) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-vcard_attachments
@@ -842,10 +490,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-virtuser_file-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-virtuser_file-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-virtuser_file-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-virtuser_file-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-virtuser_file-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-virtuser_file) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-virtuser_file
@@ -856,10 +500,6 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-virtuser_query-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-virtuser_query-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-virtuser_query-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-virtuser_query-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-virtuser_query-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-virtuser_query) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-virtuser_query
@@ -870,30 +510,7 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-zipdownload-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?plesk}
-%if 0%{?bootstrap} < 1
-Obsoletes:      %{name}-plugin-zipdownload-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-zipdownload-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-plesk) >= 0.4
-Requires:       %{name}(skin-plesk-larry) >= 0.3
-Requires:       %{name}(plugin-zipdownload-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%else
-%if 0%{?kolab_enterprise}
-%if 0%{?bootstrap} < 1
-Requires:       %{name}(skin-enterprise) >= 0.3.7
-Requires:       %{name}(skin-kolab) >= 0.4
-%endif
-Obsoletes:      %{name}-plugin-zipdownload-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-zipdownload-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-zipdownload-skin-larry = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-plugin-zipdownload-skin-larry-assets = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires:       %{name}(skin-chameleon) >= 0.3.9
-Obsoletes:      %{name}-plugin-zipdownload-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-zipdownload-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%endif
+Requires:       %{name}(plugin-zipdownload-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       %{name}(plugin-zipdownload) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-zipdownload
@@ -1011,14 +628,6 @@
 %description plugin-http_authentication-assets
 Plugin http_authentication Assets
 
-%package plugin-identicon-assets
-Summary:        Plugin identicon Assets
-Group:          Applications/Internet
-Provides:       %{name}(plugin-identicon-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-identicon-assets
-Plugin identicon Assets
-
 %package plugin-identity_select-assets
 Summary:        Plugin identity_select Assets
 Group:          Applications/Internet
@@ -1043,6 +652,14 @@
 %description plugin-krb_authentication-assets
 Plugin krb_authentication Assets
 
+%package plugin-legacy_browser-assets
+Summary:        Plugin legacy_browser Assets
+Group:          Applications/Internet
+Provides:       %{name}(plugin-legacy_browser-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-legacy_browser-assets
+Plugin legacy_browser Assets
+
 %package plugin-managesieve-assets
 Summary:        Plugin managesieve Assets
 Group:          Applications/Internet
@@ -1163,18 +780,6 @@
 %description plugin-zipdownload-assets
 Plugin zipdownload Assets
 
-%package plugin-acl-skin-elastic
-Summary:        Plugin acl / Skin elastic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-acl) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-acl-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-acl-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-acl-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-acl-skin-elastic
-Plugin acl / Skin elastic
-
 %package plugin-acl-skin-larry
 Summary:        Plugin acl / Skin larry
 Group:          Applications/Internet
@@ -1187,17 +792,41 @@
 %description plugin-acl-skin-larry
 Plugin acl / Skin larry
 
-%package plugin-enigma-skin-elastic
-Summary:        Plugin enigma / Skin elastic
+%package plugin-acl-skin-classic
+Summary:        Plugin acl / Skin classic
 Group:          Applications/Internet
-Requires:       %{name}(plugin-enigma) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-enigma-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-enigma-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-enigma-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-acl) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-acl-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-acl-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-acl-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-acl-skin-classic
+Plugin acl / Skin classic
 
-%description plugin-enigma-skin-elastic
-Plugin enigma / Skin elastic
+%package plugin-archive-skin-larry
+Summary:        Plugin archive / Skin larry
+Group:          Applications/Internet
+Requires:       %{name}(plugin-archive) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-archive-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-archive-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-archive-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-archive-skin-larry
+Plugin archive / Skin larry
+
+%package plugin-archive-skin-classic
+Summary:        Plugin archive / Skin classic
+Group:          Applications/Internet
+Requires:       %{name}(plugin-archive) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-archive-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-archive-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-archive-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-archive-skin-classic
+Plugin archive / Skin classic
 
 %package plugin-enigma-skin-larry
 Summary:        Plugin enigma / Skin larry
@@ -1211,17 +840,17 @@
 %description plugin-enigma-skin-larry
 Plugin enigma / Skin larry
 
-%package plugin-help-skin-elastic
-Summary:        Plugin help / Skin elastic
+%package plugin-enigma-skin-classic
+Summary:        Plugin enigma / Skin classic
 Group:          Applications/Internet
-Requires:       %{name}(plugin-help) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-help-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-help-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-help-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-enigma) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-enigma-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-enigma-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-enigma-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description plugin-help-skin-elastic
-Plugin help / Skin elastic
+%description plugin-enigma-skin-classic
+Plugin enigma / Skin classic
 
 %package plugin-help-skin-larry
 Summary:        Plugin help / Skin larry
@@ -1235,6 +864,18 @@
 %description plugin-help-skin-larry
 Plugin help / Skin larry
 
+%package plugin-help-skin-classic
+Summary:        Plugin help / Skin classic
+Group:          Applications/Internet
+Requires:       %{name}(plugin-help) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-help-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-help-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-help-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-help-skin-classic
+Plugin help / Skin classic
+
 %package plugin-hide_blockquote-skin-larry
 Summary:        Plugin hide_blockquote / Skin larry
 Group:          Applications/Internet
@@ -1247,18 +888,6 @@
 %description plugin-hide_blockquote-skin-larry
 Plugin hide_blockquote / Skin larry
 
-%package plugin-jqueryui-skin-elastic
-Summary:        Plugin jqueryui / Skin elastic
-Group:          Applications/Internet
-Requires:       %{name}(plugin-jqueryui) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-jqueryui-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-jqueryui-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-jqueryui-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-jqueryui-skin-elastic
-Plugin jqueryui / Skin elastic
-
 %package plugin-jqueryui-skin-larry
 Summary:        Plugin jqueryui / Skin larry
 Group:          Applications/Internet
@@ -1271,17 +900,41 @@
 %description plugin-jqueryui-skin-larry
 Plugin jqueryui / Skin larry
 
-%package plugin-managesieve-skin-elastic
-Summary:        Plugin managesieve / Skin elastic
+%package plugin-jqueryui-skin-classic
+Summary:        Plugin jqueryui / Skin classic
 Group:          Applications/Internet
-Requires:       %{name}(plugin-managesieve) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-managesieve-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-managesieve-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-managesieve-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-jqueryui) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-jqueryui-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-jqueryui-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-jqueryui-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-jqueryui-skin-classic
+Plugin jqueryui / Skin classic
+
+%package plugin-legacy_browser-skin-larry
+Summary:        Plugin legacy_browser / Skin larry
+Group:          Applications/Internet
+Requires:       %{name}(plugin-legacy_browser) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-legacy_browser-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-legacy_browser-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-legacy_browser-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-legacy_browser-skin-larry
+Plugin legacy_browser / Skin larry
+
+%package plugin-legacy_browser-skin-classic
+Summary:        Plugin legacy_browser / Skin classic
+Group:          Applications/Internet
+Requires:       %{name}(plugin-legacy_browser) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-legacy_browser-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-legacy_browser-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-legacy_browser-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description plugin-managesieve-skin-elastic
-Plugin managesieve / Skin elastic
+%description plugin-legacy_browser-skin-classic
+Plugin legacy_browser / Skin classic
 
 %package plugin-managesieve-skin-larry
 Summary:        Plugin managesieve / Skin larry
@@ -1295,6 +948,18 @@
 %description plugin-managesieve-skin-larry
 Plugin managesieve / Skin larry
 
+%package plugin-managesieve-skin-classic
+Summary:        Plugin managesieve / Skin classic
+Group:          Applications/Internet
+Requires:       %{name}(plugin-managesieve) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-managesieve-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-managesieve-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-managesieve-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-managesieve-skin-classic
+Plugin managesieve / Skin classic
+
 %package plugin-markasjunk-skin-larry
 Summary:        Plugin markasjunk / Skin larry
 Group:          Applications/Internet
@@ -1307,6 +972,18 @@
 %description plugin-markasjunk-skin-larry
 Plugin markasjunk / Skin larry
 
+%package plugin-markasjunk-skin-classic
+Summary:        Plugin markasjunk / Skin classic
+Group:          Applications/Internet
+Requires:       %{name}(plugin-markasjunk) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-markasjunk-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-markasjunk-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-markasjunk-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-markasjunk-skin-classic
+Plugin markasjunk / Skin classic
+
 %package plugin-vcard_attachments-skin-larry
 Summary:        Plugin vcard_attachments / Skin larry
 Group:          Applications/Internet
@@ -1319,6 +996,18 @@
 %description plugin-vcard_attachments-skin-larry
 Plugin vcard_attachments / Skin larry
 
+%package plugin-vcard_attachments-skin-classic
+Summary:        Plugin vcard_attachments / Skin classic
+Group:          Applications/Internet
+Requires:       %{name}(plugin-vcard_attachments) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-vcard_attachments-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-vcard_attachments-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-vcard_attachments-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-vcard_attachments-skin-classic
+Plugin vcard_attachments / Skin classic
+
 %package plugin-zipdownload-skin-larry
 Summary:        Plugin zipdownload / Skin larry
 Group:          Applications/Internet
@@ -1331,15 +1020,17 @@
 %description plugin-zipdownload-skin-larry
 Plugin zipdownload / Skin larry
 
-%package plugin-acl-skin-elastic-assets
-Summary:        Plugin acl / Skin elastic (Assets)
+%package plugin-zipdownload-skin-classic
+Summary:        Plugin zipdownload / Skin classic
 Group:          Applications/Internet
-Requires:       %{name}(plugin-acl-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-acl-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-zipdownload) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-zipdownload-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-zipdownload-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-zipdownload-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description plugin-acl-skin-elastic-assets
-Plugin acl / Skin elastic (Assets Package)
+%description plugin-zipdownload-skin-classic
+Plugin zipdownload / Skin classic
 
 %package plugin-acl-skin-larry-assets
 Summary:        Plugin acl / Skin larry (Assets)
@@ -1351,15 +1042,35 @@
 %description plugin-acl-skin-larry-assets
 Plugin acl / Skin larry (Assets Package)
 
-%package plugin-enigma-skin-elastic-assets
-Summary:        Plugin enigma / Skin elastic (Assets)
+%package plugin-acl-skin-classic-assets
+Summary:        Plugin acl / Skin classic (Assets)
 Group:          Applications/Internet
-Requires:       %{name}(plugin-enigma-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-enigma-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-acl-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-acl-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-acl-skin-classic-assets
+Plugin acl / Skin classic (Assets Package)
+
+%package plugin-archive-skin-larry-assets
+Summary:        Plugin archive / Skin larry (Assets)
+Group:          Applications/Internet
+Requires:       %{name}(plugin-archive-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-archive-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-archive-skin-larry-assets
+Plugin archive / Skin larry (Assets Package)
+
+%package plugin-archive-skin-classic-assets
+Summary:        Plugin archive / Skin classic (Assets)
+Group:          Applications/Internet
+Requires:       %{name}(plugin-archive-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-archive-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description plugin-enigma-skin-elastic-assets
-Plugin enigma / Skin elastic (Assets Package)
+%description plugin-archive-skin-classic-assets
+Plugin archive / Skin classic (Assets Package)
 
 %package plugin-enigma-skin-larry-assets
 Summary:        Plugin enigma / Skin larry (Assets)
@@ -1371,15 +1082,15 @@
 %description plugin-enigma-skin-larry-assets
 Plugin enigma / Skin larry (Assets Package)
 
-%package plugin-help-skin-elastic-assets
-Summary:        Plugin help / Skin elastic (Assets)
+%package plugin-enigma-skin-classic-assets
+Summary:        Plugin enigma / Skin classic (Assets)
 Group:          Applications/Internet
-Requires:       %{name}(plugin-help-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-help-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-enigma-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-enigma-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description plugin-help-skin-elastic-assets
-Plugin help / Skin elastic (Assets Package)
+%description plugin-enigma-skin-classic-assets
+Plugin enigma / Skin classic (Assets Package)
 
 %package plugin-help-skin-larry-assets
 Summary:        Plugin help / Skin larry (Assets)
@@ -1391,6 +1102,16 @@
 %description plugin-help-skin-larry-assets
 Plugin help / Skin larry (Assets Package)
 
+%package plugin-help-skin-classic-assets
+Summary:        Plugin help / Skin classic (Assets)
+Group:          Applications/Internet
+Requires:       %{name}(plugin-help-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-help-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-help-skin-classic-assets
+Plugin help / Skin classic (Assets Package)
+
 %package plugin-hide_blockquote-skin-larry-assets
 Summary:        Plugin hide_blockquote / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1401,16 +1122,6 @@
 %description plugin-hide_blockquote-skin-larry-assets
 Plugin hide_blockquote / Skin larry (Assets Package)
 
-%package plugin-jqueryui-skin-elastic-assets
-Summary:        Plugin jqueryui / Skin elastic (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-jqueryui-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-jqueryui-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-jqueryui-skin-elastic-assets
-Plugin jqueryui / Skin elastic (Assets Package)
-
 %package plugin-jqueryui-skin-larry-assets
 Summary:        Plugin jqueryui / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1421,15 +1132,35 @@
 %description plugin-jqueryui-skin-larry-assets
 Plugin jqueryui / Skin larry (Assets Package)
 
-%package plugin-managesieve-skin-elastic-assets
-Summary:        Plugin managesieve / Skin elastic (Assets)
+%package plugin-jqueryui-skin-classic-assets
+Summary:        Plugin jqueryui / Skin classic (Assets)
 Group:          Applications/Internet
-Requires:       %{name}(plugin-managesieve-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-managesieve-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-jqueryui-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-jqueryui-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-jqueryui-skin-classic-assets
+Plugin jqueryui / Skin classic (Assets Package)
+
+%package plugin-legacy_browser-skin-larry-assets
+Summary:        Plugin legacy_browser / Skin larry (Assets)
+Group:          Applications/Internet
+Requires:       %{name}(plugin-legacy_browser-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-legacy_browser-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-legacy_browser-skin-larry-assets
+Plugin legacy_browser / Skin larry (Assets Package)
+
+%package plugin-legacy_browser-skin-classic-assets
+Summary:        Plugin legacy_browser / Skin classic (Assets)
+Group:          Applications/Internet
+Requires:       %{name}(plugin-legacy_browser-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-legacy_browser-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description plugin-managesieve-skin-elastic-assets
-Plugin managesieve / Skin elastic (Assets Package)
+%description plugin-legacy_browser-skin-classic-assets
+Plugin legacy_browser / Skin classic (Assets Package)
 
 %package plugin-managesieve-skin-larry-assets
 Summary:        Plugin managesieve / Skin larry (Assets)
@@ -1441,6 +1172,16 @@
 %description plugin-managesieve-skin-larry-assets
 Plugin managesieve / Skin larry (Assets Package)
 
+%package plugin-managesieve-skin-classic-assets
+Summary:        Plugin managesieve / Skin classic (Assets)
+Group:          Applications/Internet
+Requires:       %{name}(plugin-managesieve-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-managesieve-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-managesieve-skin-classic-assets
+Plugin managesieve / Skin classic (Assets Package)
+
 %package plugin-markasjunk-skin-larry-assets
 Summary:        Plugin markasjunk / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1451,6 +1192,16 @@
 %description plugin-markasjunk-skin-larry-assets
 Plugin markasjunk / Skin larry (Assets Package)
 
+%package plugin-markasjunk-skin-classic-assets
+Summary:        Plugin markasjunk / Skin classic (Assets)
+Group:          Applications/Internet
+Requires:       %{name}(plugin-markasjunk-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-markasjunk-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-markasjunk-skin-classic-assets
+Plugin markasjunk / Skin classic (Assets Package)
+
 %package plugin-vcard_attachments-skin-larry-assets
 Summary:        Plugin vcard_attachments / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1461,6 +1212,16 @@
 %description plugin-vcard_attachments-skin-larry-assets
 Plugin vcard_attachments / Skin larry (Assets Package)
 
+%package plugin-vcard_attachments-skin-classic-assets
+Summary:        Plugin vcard_attachments / Skin classic (Assets)
+Group:          Applications/Internet
+Requires:       %{name}(plugin-vcard_attachments-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-vcard_attachments-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-vcard_attachments-skin-classic-assets
+Plugin vcard_attachments / Skin classic (Assets Package)
+
 %package plugin-zipdownload-skin-larry-assets
 Summary:        Plugin zipdownload / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1471,16 +1232,15 @@
 %description plugin-zipdownload-skin-larry-assets
 Plugin zipdownload / Skin larry (Assets Package)
 
-%package skin-elastic
-Summary:        Skin elastic
+%package plugin-zipdownload-skin-classic-assets
+Summary:        Plugin zipdownload / Skin classic (Assets)
 Group:          Applications/Internet
-Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-zipdownload-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-zipdownload-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description skin-elastic
-Skin elastic
+%description plugin-zipdownload-skin-classic-assets
+Plugin zipdownload / Skin classic (Assets Package)
 
 %package skin-larry
 Summary:        Skin larry
@@ -1493,14 +1253,16 @@
 %description skin-larry
 Skin larry
 
-%package skin-elastic-assets
-Summary:        Skin elastic (Assets)
+%package skin-classic
+Summary:        Skin classic
 Group:          Applications/Internet
-Provides:       %{name}(skin-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description skin-elastic-assets
-Skin elastic (Assets Package)
+%description skin-classic
+Skin classic
 
 %package skin-larry-assets
 Summary:        Skin larry (Assets)
@@ -1511,51 +1273,30 @@
 %description skin-larry-assets
 Skin larry (Assets Package)
 
-%prep
-%setup -q -c "%{name}-%{version}%{?dash_rel_suffix}"
-
-pushd %{name}-%{version}%{?dash_rel_suffix}
+%package skin-classic-assets
+Summary:        Skin classic (Assets)
+Group:          Applications/Internet
+Provides:       %{name}(skin-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-cp -vf "%{SOURCE200}" SQL/mysql/
-rm -rvf SQL/mysql/2016081200.sql
+%description skin-classic-assets
+Skin classic (Assets Package)
 
-rm -rf temp/js_cache/
+%prep
+%setup -q -c "%{name}-%{version}"
 
-find . -type d -name "classic" | while read dir; do
-    rm -rvf ${dir}
-done
-
-%if 0%{?plesk}
-cp -vf %{SOURCE100} config/config.inc.php.sample
-cp -vf %{SOURCE101} plugins/managesieve/config.inc.php.dist
-cp -vf %{SOURCE102} plugins/password/config.inc.php.dist
-%endif
+pushd %{name}-%{version}
 
 %patch201 -p1
-%if 0%{?plesk} < 1
-%patch202 -p1
-%endif
-%patch203 -p1
 
 # Remove the results of patching when there's an incidental offset
-find . -type f -name "*.orig" | while read file; do
-    rm -rvf ${file}
-done
+find . -type f -name "*.orig" -delete
 
-# Remove hidden files and directories
-find . -type f -name ".*" | while read file; do
-    rm -rvf ${file}
-done
+# Remove hidden files
+find . -type f -name ".*" -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 file URI modifier
+sed -r -i -e 's/^(\s+)protected function file_mod(.*)$/\1protected function file_mod\2 { return $file; }\n\1protected function dummy\2/g' program/include/rcmail_output_html.php
 
 # Remove any reference to sqlite in config file so people don't
 # mistakely assume it works
@@ -1566,17 +1307,17 @@
 rm -rf plugins/password/helpers/chpass-wrapper.py
 popd
 
-cp -a %{name}-%{version}%{?dash_rel_suffix}/{CHANGELOG,LICENSE,README.md} .
+cp -a %{name}-%{version}/{CHANGELOG,LICENSE,README.md} .
 
-rm -rf %{name}-%{version}%{?dash_rel_suffix}/plugins/jqueryui/themes/redmond
+rm -rf %{name}-%{version}/plugins/jqueryui/themes/redmond
 
-for skin in elastic larry; do
+for skin in larry classic; do
     # Template files and the like
-    for sdir in $(find %{name}-%{version}%{?dash_rel_suffix}/ -type d -name "${skin}" | sort); do
-        target_dir=$(echo ${sdir} | %{__sed} -e "s|%{name}-%{version}%{?dash_rel_suffix}|%{name}-skin-${skin}-%{version}%{?dash_rel_suffix}|g")
-        %{__mkdir_p} $(dirname ${target_dir})
+    for sdir in $(find %{name}-%{version}/ -type d -name "${skin}" | sort); do
+        target_dir=$(echo $sdir | %{__sed} -e "s|%{name}-%{version}|%{name}-skin-${skin}-%{version}|g")
+        %{__mkdir_p} $(dirname $target_dir)
         # Copy all, including assets, for the -devel sub-package
-        cp -av ${sdir} ${target_dir}
+        cp -av $sdir $target_dir
     done
 
     (
@@ -1617,18 +1358,18 @@
         echo ""
     ) >> skins-assets.files
 
-    %{__rm} -rf %{name}-skin-${skin}-%{version}%{?dash_rel_suffix}/plugins
+    %{__rm} -rf %{name}-skin-${skin}-%{version}/plugins
 done
 
-for plugin in $(find %{name}-%{version}%{?dash_rel_suffix}/plugins -mindepth 1 -maxdepth 1 -type d | sort); do
-    target_dir=$(echo ${plugin} | %{__sed} -e "s|%{name}-%{version}%{?dash_rel_suffix}|%{name}-plugin-$(basename ${plugin})-%{version}%{?dash_rel_suffix}|g")
-    %{__mkdir_p} $(dirname ${target_dir})
-    cp -av ${plugin} ${target_dir}
+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
 
     # Special treatment of the jquery plugin
     if  "$(basename ${plugin})" == "jqueryui" ; then
-        %{__mv} ${target_dir}/themes ${target_dir}/skins
-        %{__sed} -i -e 's/themes/skins/g' ${target_dir}/{config.inc.php.dist,jqueryui.php,README}
+        %{__mv} $target_dir/themes $target_dir/skins
+        %{__sed} -i -e 's/themes/skins/g' $target_dir/{config.inc.php.dist,jqueryui.php,README}
     fi
 
     (
@@ -1637,61 +1378,8 @@
         echo "Group:          Applications/Internet"
         echo "Requires:       %%{name}(core) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
         echo "Requires:       %%{name}(plugin-$(basename ${plugin})-assets) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-        if  "$(basename ${plugin})" == "enigma" ; then
-            echo "Requires:       php-pear-crypt-gpg"
-        fi
         if  -d "${target_dir}/skins/" ; then
-            echo "%%if 0%%{?plesk}"
-            echo "%%if 0%%{?bootstrap} < 1"
-            if  -d "${target_dir}/skins/elastic/" ; then
-                echo "Requires:       %%{name}(plugin-$(basename ${plugin})-skin-elastic) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            else
-                echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-elastic < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-                echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-elastic-assets < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            fi
-            echo "Requires:       %%{name}(skin-plesk) >= 0.4"
-            echo "Requires:       %%{name}(skin-plesk-larry) >= 0.3"
-            echo "Requires:       %%{name}(plugin-$(basename ${plugin})-skin-larry) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            echo "%%endif"
-            echo "%%else"
-            echo "%%if 0%%{?kolab_enterprise}"
-            echo "%%if 0%%{?bootstrap} < 1"
-            echo "Requires:       %%{name}(skin-enterprise) >= 0.3.7"
-            echo "Requires:       %%{name}(skin-kolab) >= 0.4"
-            echo "%%endif"
-            if  -d "${target_dir}/skins/elastic/" ; then
-                echo "Requires:       %%{name}-plugin-$(basename ${plugin})-skin-elastic = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-                echo "Requires:       %%{name}-plugin-$(basename ${plugin})-skin-elastic-assets = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            else
-                echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-elastic < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-                echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-elastic-assets < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            fi
-            if  -d "${target_dir}/skins/larry/" ; then
-                echo "Requires:       %%{name}-plugin-$(basename ${plugin})-skin-larry = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-                echo "Requires:       %%{name}-plugin-$(basename ${plugin})-skin-larry-assets = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            else
-                echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-larry < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-                echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-larry-assets < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            fi
-            echo "%%else"
-            echo "Requires:       %%{name}(skin-chameleon) >= 0.3.9"
-            if  -d "${target_dir}/skins/elastic/" ; then
-                echo "Requires:       %%{name}(plugin-$(basename ${plugin})-skin-elastic) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            else
-                echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-elastic < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            fi
-            if  -d "${target_dir}/skins/larry/" ; then
-                echo "Requires:       %%{name}(plugin-$(basename ${plugin})-skin-larry) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            else
-                echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-larry < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            fi
-            echo "%%endif"
-            echo "%%endif"
-        else
-            echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-elastic < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-elastic-assets < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-larry < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
-            echo "Obsoletes:      %%{name}-plugin-$(basename ${plugin})-skin-larry-assets < %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
+            echo "Requires:       %%{name}(plugin-$(basename ${plugin})-skin) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
         fi
         echo "Provides:       %%{name}(plugin-$(basename ${plugin})) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
         echo ""
@@ -1721,7 +1409,7 @@
         echo "%posttrans plugin-$(basename ${plugin})"
         echo "if  ! -f "%%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ; then"
         echo "    if  -f \"%%{php_inidir}/apc.ini\" -o -f \"%%{php_inidir}/apcu.ini\" ; then"
-        echo "        if  ! -z \"\$(grep ^apc.enabled=1 %%{php_inidir}/apc{,u}.ini 2>/dev/null)\" ; then"
+        echo "        if  ! -z \"\$(grep ^apc.enabled=1 %%{php_inidir}/apc{,u}.ini)\" ; then"
         echo "%if 0%%{?with_systemd}"
         echo "            /bin/systemctl condrestart %%{httpd_name}.service"
         echo "%else"
@@ -1742,7 +1430,7 @@
             echo "        fi"
             echo "    fi"
             echo ""
-            echo "    %%{_datadir}/roundcubemail/bin/updatedb.sh \\"
+            echo "    /usr/share/roundcubemail/bin/updatedb.sh \\"
             echo "        --dir \$dir \\"
             echo "        --package $(basename ${plugin}) \\"
             echo "        >/dev/null 2>&1 || :"
@@ -1769,11 +1457,11 @@
         echo ""
     ) >> plugins-assets.files
 
-    for skin in elastic larry; do
-        for dir in $(find ${target_dir} -type d -name "${skin}" | sort); do
-            starget_dir=$(echo ${dir} | %{__sed} -e "s|%{name}-plugin-$(basename ${plugin})-%{version}%{?dash_rel_suffix}|%{name}-plugin-$(basename ${plugin})-skin-${skin}-%{version}%{?dash_rel_suffix}|g")
-            %{__mkdir_p} $(dirname ${starget_dir})
-            %{__mv} ${dir} ${starget_dir}
+    for skin in larry classic; do
+        for dir in $(find $target_dir -type d -name "${skin}" | sort); do
+            starget_dir=$(echo $dir | %{__sed} -e "s|%{name}-plugin-$(basename ${plugin})-%{version}|%{name}-plugin-$(basename ${plugin})-skin-${skin}-%{version}|g")
+            %{__mkdir_p} $(dirname $starget_dir)
+            %{__mv} $dir $starget_dir
 
             (
                 echo "%package plugin-$(basename ${plugin})-skin-${skin}"
@@ -1839,7 +1527,7 @@
 find | sort | tee files.find >/dev/null
 
 %build
-pushd %{name}-%{version}%{?dash_rel_suffix}
+pushd %{name}-%{version}
 mkdir -p $HOME/.composer
 echo '{}' > $HOME/.composer/composer.json
 cat > composer.json << EOF
@@ -1877,26 +1565,21 @@
 %{__rm} -rf %{buildroot}
 
 %{__install} -d \
-%if 0%{?plesk} < 1
     %{buildroot}%{_ap_sysconfdir}/conf.d \
-%endif
     %{buildroot}%{_sysconfdir}/logrotate.d \
     %{buildroot}%{confdir} \
     %{buildroot}%{datadir}/public_html \
     %{buildroot}%{logdir} \
-    %{buildroot}%{tmpdir}/plugins
+    %{buildroot}%{tmpdir}
 
-pushd %{name}-%{version}%{?dash_rel_suffix}
+pushd %{name}-%{version}
+# Move robots.txt to the correct place
+%{__install} -pm 644 robots.txt %{buildroot}%{datadir}/public_html/robots.txt
 
-%if 0%{?plesk} < 1
 %{__install} -pm 644 %SOURCE20 %{buildroot}%{_ap_sysconfdir}/conf.d
-%endif
 
 %{__install} -pm 644 %SOURCE21 %{buildroot}%{_sysconfdir}/logrotate.d/roundcubemail
 
-sed -i -e 's/apache apache/%{httpd_user} %{httpd_group}/g' \
-    %{buildroot}%{_sysconfdir}/logrotate.d/roundcubemail
-
 # use dist files as config files
 %{__install} -pm 644 config/config.inc.php.sample %{buildroot}%{confdir}/config.inc.php
 %{__install} -pm 644 config/defaults.inc.php %{buildroot}%{confdir}/defaults.inc.php
@@ -1975,8 +1658,8 @@
 
 %{__mkdir_p} ${asset_path}
 
-orig_dir="%{name}-%{version}%{?dash_rel_suffix}"
-asset_dir="%{name}-assets-%{version}%{?dash_rel_suffix}$(echo ${asset_path} | %{__sed} -e 's|%{buildroot}%{datadir}||g')"
+orig_dir="%{name}-%{version}"
+asset_dir="%{name}-assets-%{version}$(echo ${asset_path} | %{__sed} -e 's|%{buildroot}%{datadir}||g')"
 
 # Remove the skins and installer directories from ${orig_dir}
 %{__rm} -rf ${orig_dir}/{installer,skins}
@@ -1984,36 +1667,29 @@
 echo "Original directory for core: ${orig_dir}"
 echo "Asset directory for core: ${asset_dir}"
 
-# Compile and compress the CSS
-for file in `find ${orig_dir} -type f -name "styles.less" -o -name "print.less" -o -name "embed.less" | grep -vE "${orig_dir}/(plugins|skins)/" `; do
-    asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
-    %{__mkdir_p} ${asset_loc}
-    %{_bindir}/lessc -x ${file} > ${asset_loc}/$(basename ${file} .less).css
-done
-find ${asset_loc} -type f -name "*.css" -empty -delete
-find ${asset_loc} -type d -empty -delete
-
 # Compress the CSS
 for file in `find ${orig_dir} -type f -name "*.css" ! -path "*tests/*" | grep -vE "${orig_dir}/(plugins|skins)/"`; do
     asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
     %{__mkdir_p} ${asset_loc}
-    cat ${file} | python %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) || \
-        %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
+    cat ${file} | python %{_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" | grep -vE "${orig_dir}/(plugins|skins)/"`; do
     asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
     %{__mkdir_p} ${asset_loc}
-    uglifyjs ${file} > ${asset_loc}/$(basename ${file}) || \
-        %{__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" | grep -vE "${orig_dir}/(plugins|skins)/"`; 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
@@ -2028,82 +1704,72 @@
         -name "*.svg" -o \
         -name "*.swf" -o \
         -name "*.tif" -o \
-        -name "*.tiff" -o \
         -name "*.ttf" -o \
         -name "*.wav" -o \
-        -name "*.webp" -o \
-        -name "*.woff" -o \
-        -name "*.woff2" | \
+        -name "*.woff" | \
         grep -vE "${orig_dir}/(plugins|skins)/"
     ); 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
 
 new_files > core.files
 
-#echo "== Files for core: =="
-#cat core.files
-#echo "==========================="
+echo "== Files for core: =="
+cat core.files
+echo "==========================="
 
-for file in `find %{name}-assets-%{version}%{?dash_rel_suffix}/ -type f`; do
-    asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|%{name}-assets-%{version}%{?dash_rel_suffix}|%{buildroot}%{datadir}|g"))
+for file in `find %{name}-assets-%{version}/ -type f`; do
+    asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|%{name}-assets-%{version}|%{buildroot}%{datadir}|g"))
     %{__mkdir_p} ${asset_loc}
-    %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
+    %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
 done
 
 new_files > core-assets.files
 
-#echo "== Files for core assets: =="
-#cat core-assets.files
-#echo "==========================="
+echo "== Files for core assets: =="
+cat core-assets.files
+echo "==========================="
 
 echo "================================================================="
 echo "Dividing Skin Assets and Non-Assets"
 echo "================================================================="
 
-for skin in elastic larry; do
+for skin in larry classic; do
     # Take the files from the original directory,
     # Find the ones that are assets,
     # Move those over to the assets-specific directory.
 
-    orig_dir="%{name}-skin-${skin}-%{version}%{?dash_rel_suffix}"
-    asset_dir="%{name}-skin-${skin}-assets-%{version}%{?dash_rel_suffix}$(echo ${asset_path} | %{__sed} -e 's|%{buildroot}%{datadir}||g')"
+    orig_dir="%{name}-skin-${skin}-%{version}"
+    asset_dir="%{name}-skin-${skin}-assets-%{version}$(echo ${asset_path} | %{__sed} -e 's|%{buildroot}%{datadir}||g')"
 
     echo "Original directory for the ${skin} skin: ${orig_dir}"
     echo "Asset directory for the ${skin} skin: ${asset_dir}"
 
-    # Compile and compress the CSS
-    for file in `find ${orig_dir} -type f -name "styles.less" -o -name "print.less" -o -name "embed.less"`; do
-        asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
-        %{__mkdir_p} ${asset_loc}
-        %{_bindir}/lessc -x ${file} > ${asset_loc}/$(basename ${file} .less).css
-    done
-    find ${asset_loc} -type f -name "*.css" -empty -delete
-    find ${asset_log} -type d -empty -delete
-
     # Compress the CSS
     for file in `find ${orig_dir} -type f -name "*.css" ! -path "*tests/*"`; do
         asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
         %{__mkdir_p} ${asset_loc}
-        cat ${file} | python %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) || \
-            %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
+        cat ${file} | python %{_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
@@ -2118,96 +1784,79 @@
             -name "*.svg" -o \
             -name "*.swf" -o \
             -name "*.tif" -o \
-            -name "*.tiff" -o \
             -name "*.ttf" -o \
             -name "*.wav" -o \
-            -name "*.webp" -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
 
     # The watermark.html is an asset, too
     if  -f "${orig_dir}/skins/${skin}/watermark.html" ; then
-        %{__cp} -av ${orig_dir}/skins/${skin}/watermark.html \
+        %{__mv} -v ${orig_dir}/skins/${skin}/watermark.html \
             ${asset_dir}/skins/${skin}/watermark.html
     fi
 
-    find %{name}-skin-${skin}-%{version}%{?dash_rel_suffix}/skins/ -type d -empty -delete
+    find %{name}-skin-${skin}-%{version}/skins/ -type d -empty -delete
 
-    cp -a %{name}-skin-${skin}-%{version}%{?dash_rel_suffix}/skins/* %{buildroot}%{datadir}/skins/.
-
-    if  "${skin}" == "elastic" ; then
-        pushd %{buildroot}%{datadir}/skins/elastic
-        %{__rm} -rvf images
-        ln -s ../../public_html/assets/skins/elastic/images images
-        popd
-    fi
+    cp -a %{name}-skin-${skin}-%{version}/skins/* %{buildroot}%{datadir}/skins/.
 
     new_files > skin-${skin}.files
 
-    #echo "== Files for skin ${skin}: =="
-    #cat skin-${skin}.files
-    #echo "==========================="
+    echo "== Files for skin ${skin}: =="
+    cat skin-${skin}.files
+    echo "==========================="
 
     %{__mkdir_p} %{buildroot}%{datadir}/public_html/assets/skins/
-    cp -a %{name}-skin-${skin}-assets-%{version}%{?dash_rel_suffix}/public_html/assets/skins/* %{buildroot}%{datadir}/public_html/assets/skins/.
+    cp -a %{name}-skin-${skin}-assets-%{version}/public_html/assets/skins/* %{buildroot}%{datadir}/public_html/assets/skins/.
 
     new_files > skin-${skin}-assets.files
 
-    #echo "== Files for skin assets ${skin}: =="
-    #cat skin-${skin}-assets.files
-    #echo "==========================="
+    echo "== Files for skin assets ${skin}: =="
+    cat skin-${skin}-assets.files
+    echo "==========================="
 done
 
-echo "==================================================================================="
+echo "================================================================="
 echo "Dividing Plugins, Plugin Assets, Plugin Skins and Plugin Skin Assets and Non-Assets"
-echo "==================================================================================="
+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}"
+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}"
 
         # No skin, no assets
         if  ! -d "${orig_dir}" ; then
             continue
         fi
 
-        asset_dir="%{name}-plugin-${plugin}-skin-${skin}-assets-%{version}%{?dash_rel_suffix}"
-
-        # Compile and compress the CSS
-        for file in `find ${orig_dir} -type f -name "styles.less" -o -name "print.less" -o -name "embed.less" `; do
-            asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
-            %{__mkdir_p} ${asset_loc}
-            %{_bindir}/lessc -x ${file} > ${asset_loc}/$(basename ${file} .less).css
-        done
-        find ${asset_loc} -type f ! -name "*.css" -empty -delete
-        find ${asset_loc} -type d -empty -delete
+        asset_dir="%{name}-plugin-${plugin}-skin-${skin}-assets-%{version}"
 
         # Compress the CSS
         for file in `find ${orig_dir} -type f -name "*.css" ! -path "*tests/"`; do
             asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
             %{__mkdir_p} ${asset_loc}
-            cat ${file} | python %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) || \
-                %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
+            cat ${file} | python %{_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
@@ -2222,16 +1871,13 @@
                 -name "*.svg" -o \
                 -name "*.swf" -o \
                 -name "*.tif" -o \
-                -name "*.tiff" -o \
                 -name "*.ttf" -o \
                 -name "*.wav" -o \
-                -name "*.webp" -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
@@ -2239,7 +1885,7 @@
     done
 
     %{__mkdir_p} %{buildroot}%{plugindir}
-    cp -a %{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}
@@ -2248,55 +1894,39 @@
         popd
     fi
 
-    if  "${plugin}" == "enigma" ; then
-        %{__mkdir_p} %{buildroot}%{tmpdir}/plugins/${plugin}/
-        pushd %{buildroot}%{plugindir}/${plugin}
-        %{__mv} -v home %{buildroot}%{tmpdir}/plugins/${plugin} || \
-            mkdir -p %{buildroot}%{tmpdir}/plugins/${plugin}
-        ln -sv ../../../../..%{tmpdir}/plugins/${plugin} home
-        popd
-    fi
-
     new_files > plugin-${plugin}.files
 
-    #echo "== Files for plugin ${plugin}: =="
-    #cat plugin-${plugin}.files
-    #echo "==========================="
+    echo "== Files for plugin ${plugin}: =="
+    cat plugin-${plugin}.files
+    echo "==========================="
 
     # Skin-independent assets
-    orig_dir="%{name}-plugin-${plugin}-%{version}%{?dash_rel_suffix}"
-    asset_dir="%{name}-plugin-${plugin}-assets-%{version}%{?dash_rel_suffix}"
-
-    # Compile and compress the CSS
-    for file in `find ${orig_dir} -type f -name "styles.less" -o -name "print.less" -o -name "embed.less" `; do
-        asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
-        %{__mkdir_p} ${asset_loc}
-        %{_bindir}/lessc -x ${file} > ${asset_loc}/$(basename ${file} .less).css
-    done
-    find ${asset_loc} -type f -empty -delete
-    find ${asset_loc} -type d -empty -delete
+    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" ! -path "*tests/"`; do
         asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
         %{__mkdir_p} ${asset_loc}
-        cat ${file} | python %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) || \
-            %{__cp} -av ${file} ${asset_loc}/$(basename ${file})
+        cat ${file} | python %{_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
@@ -2311,69 +1941,76 @@
             -name "*.svg" -o \
             -name "*.swf" -o \
             -name "*.tif" -o \
-            -name "*.tiff" -o \
             -name "*.ttf" -o \
             -name "*.wav" -o \
-            -name "*.webp" -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
     find ${orig_dir} -type d -empty -delete
 
-%if 0%{?fedora}
-    # Empty packages are not fun with Fedora
-    if  ! -d ${asset_loc} ; then
-        %{__mkdir_p} ${asset_loc}
-        echo "/* Nothing here */" > ${asset_loc}/dummy.js
+    if  ! -d ${asset_dir} ; then
+        %{__mkdir_p} ${asset_dir}
+        touch ${asset_dir}/dummy.js
     fi
-%endif
 
     # 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}: =="
+    cat plugin-${plugin}-assets.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 -f plugin-${plugin}-skin-${skin}.files
-            rm -f plugin-${plugin}-skin-${skin}-assets.files
+        if  ! -d "%{name}-plugin-${plugin}-skin-${skin}-%{version}/plugins/${plugin}/skins" ; then
+            echo "%doc README.md" > plugin-${plugin}-skin-${skin}.files
+            echo "%doc README.md" > plugin-${plugin}-skin-${skin}-assets.files
             continue
         fi
 
         %{__install} -d %{buildroot}%{plugindir}/${plugin}/skins/
-        cp -a %{name}-plugin-${plugin}-skin-${skin}-%{version}%{?dash_rel_suffix}/plugins/${plugin}/skins/${skin} %{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
         if  ! -s "plugin-${plugin}-skin-${skin}.files" ; then
-            rm -f plugin-${plugin}-skin-${skin}.files
+            echo "%doc README.md" > plugin-${plugin}-skin-${skin}.files
         fi
 
+        echo "== Files for skin ${plugin}-${skin}: =="
+        cat plugin-${plugin}-skin-${skin}.files
+        echo "==========================="
+
         # Install the assets
-        for file in `find %{name}-plugin-${plugin}-skin-${skin}-assets-%{version}%{?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})
+            %{__mv} -v ${file} ${asset_loc}/$(basename ${file})
         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
+            echo "%doc README.md" > plugin-${plugin}-skin-${skin}-assets.files
         fi
+
+        echo "== Files for skin ${plugin}-${skin}: =="
+        cat plugin-${plugin}-skin-${skin}-assets.files
+        echo "==========================="
+
     done
 done
 
@@ -2393,7 +2030,7 @@
 fi
 
 %check
-pushd %{name}-%{version}%{?dash_rel_suffix}/tests
+pushd %{name}-%{version}/tests
 phpunit --debug || :
 popd
 
@@ -2475,22 +2112,22 @@
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
 fi
 
-%pre plugin-identicon
+%pre plugin-identity_select
 if  -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ; then
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
 fi
 
-%pre plugin-identity_select
+%pre plugin-jqueryui
 if  -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ; then
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
 fi
 
-%pre plugin-jqueryui
+%pre plugin-krb_authentication
 if  -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ; then
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
 fi
 
-%pre plugin-krb_authentication
+%pre plugin-legacy_browser
 if  -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ; then
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
 fi
@@ -2585,8 +2222,6 @@
     echo $str
 }
 
-find %{logdir} -mindepth 1 -maxdepth 1 -type f -exec chown %{httpd_user}:%{httpd_group} {} \;
-
 %{__sed} -i "s/rcmail-\!24ByteDESkey\*Str/`makedesstr`/" /etc/roundcubemail/defaults.inc.php || : &> /dev/null
 
 %{__sed} -i -r -e "s/.*(\s*define$\s*'RCMAIL_VERSION'\s*,\s*').*('$;)/\1%{version}-%{release}\2/g" \
@@ -2594,7 +2229,7 @@
 
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2606,8 +2241,8 @@
     touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
 fi
 
-%{_datadir}/roundcubemail/bin/updatedb.sh \
-    --dir %{_datadir}/doc/roundcubemail-core-%{version}/SQL/ \
+/usr/share/roundcubemail/bin/updatedb.sh \
+    --dir /usr/share/doc/roundcubemail-%{version}/SQL/ \
     --package roundcube || : \
     >/dev/null 2>&1
 
@@ -2616,7 +2251,7 @@
 %posttrans plugin-acl
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2631,7 +2266,7 @@
 %posttrans plugin-additional_message_headers
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2646,7 +2281,7 @@
 %posttrans plugin-archive
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2661,7 +2296,7 @@
 %posttrans plugin-attachment_reminder
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2676,7 +2311,7 @@
 %posttrans plugin-autologon
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2691,7 +2326,7 @@
 %posttrans plugin-database_attachments
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2706,7 +2341,7 @@
 %posttrans plugin-debug_logger
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2721,7 +2356,7 @@
 %posttrans plugin-emoticons
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2736,7 +2371,7 @@
 %posttrans plugin-enigma
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2751,7 +2386,7 @@
 %posttrans plugin-example_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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ; then
+        if  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2766,7 +2401,7 @@
 %posttrans plugin-filesystem_attachments
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2781,7 +2416,7 @@
 %posttrans plugin-help
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2796,7 +2431,7 @@
 %posttrans plugin-hide_blockquote
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2811,7 +2446,7 @@
 %posttrans plugin-http_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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ; then
+        if  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2823,10 +2458,10 @@
     touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
 fi
 
-%posttrans plugin-identicon
+%posttrans plugin-identity_select
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2838,10 +2473,10 @@
     touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
 fi
 
-%posttrans plugin-identity_select
+%posttrans plugin-jqueryui
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2853,10 +2488,10 @@
     touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
 fi
 
-%posttrans plugin-jqueryui
+%posttrans plugin-krb_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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ; then
+        if  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2868,10 +2503,10 @@
     touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
 fi
 
-%posttrans plugin-krb_authentication
+%posttrans plugin-legacy_browser
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2886,7 +2521,7 @@
 %posttrans plugin-managesieve
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2901,7 +2536,7 @@
 %posttrans plugin-markasjunk
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2916,7 +2551,7 @@
 %posttrans plugin-new_user_dialog
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2931,7 +2566,7 @@
 %posttrans plugin-new_user_identity
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2946,7 +2581,7 @@
 %posttrans plugin-newmail_notifier
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2961,7 +2596,7 @@
 %posttrans plugin-password
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2976,7 +2611,7 @@
 %posttrans plugin-redundant_attachments
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2991,7 +2626,7 @@
 %posttrans plugin-show_additional_headers
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -3006,7 +2641,7 @@
 %posttrans plugin-squirrelmail_usercopy
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -3021,7 +2656,7 @@
 %posttrans plugin-subscriptions_option
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -3036,7 +2671,7 @@
 %posttrans plugin-userinfo
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -3051,7 +2686,7 @@
 %posttrans plugin-vcard_attachments
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -3066,7 +2701,7 @@
 %posttrans plugin-virtuser_file
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -3081,7 +2716,7 @@
 %posttrans plugin-virtuser_query
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -3096,7 +2731,7 @@
 %posttrans plugin-zipdownload
 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  ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -3110,28 +2745,24 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{name}-%{version}%{?dash_rel_suffix}/LICENSE
-%doc %{name}-%{version}%{?dash_rel_suffix}/UPGRADING
-%doc %{name}-%{version}%{?dash_rel_suffix}/SQL
+%doc %{name}-%{version}/LICENSE
+%doc %{name}-%{version}/UPGRADING
+%doc %{name}-%{version}/SQL
 
 %files core -f core.files
 %defattr(-,root,root,-)
-%doc %{name}-%{version}%{?dash_rel_suffix}/SQL
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %if 0%{?suse_version}
 %dir %{_ap_sysconfdir}/
 %dir %{_ap_sysconfdir}/conf.d/
 %attr(0755,root,%{httpd_group}) %dir %{confdir}
 %endif
-%if 0%{?plesk} < 1
 %config(noreplace) %{_ap_sysconfdir}/conf.d/%{name}.conf
-%endif
 %attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/config.inc.php
-%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/defaults.inc.php
+%attr(0640,root,%{httpd_group}) %{confdir}/defaults.inc.php
 %attr(0640,root,%{httpd_group}) %{confdir}/mimetypes.php
 %attr(0770,root,%{httpd_group}) %dir %{logdir}
 %attr(0770,root,%{httpd_group}) %dir %{tmpdir}
-%attr(0770,root,%{httpd_group}) %dir %{tmpdir}/plugins
 %dir %{_localstatedir}/lib/rpm-state/
 %dir %{_localstatedir}/lib/rpm-state/roundcubemail/
 
@@ -3187,9 +2818,6 @@
 %defattr(-,root,root,-)
 %attr(0640,root,%{httpd_group}) %config(noreplace) %{_sysconfdir}/%{name}/http_authentication.inc.php
 
-%files plugin-identicon -f plugin-identicon.files
-%defattr(-,root,root,-)
-
 %files plugin-identity_select -f plugin-identity_select.files
 %defattr(-,root,root,-)
 
@@ -3201,13 +2829,15 @@
 %defattr(-,root,root,-)
 %attr(0640,root,%{httpd_group}) %config(noreplace) %{_sysconfdir}/%{name}/krb_authentication.inc.php
 
+%files plugin-legacy_browser -f plugin-legacy_browser.files
+%defattr(-,root,root,-)
+
 %files plugin-managesieve -f plugin-managesieve.files
 %defattr(-,root,root,-)
 %attr(0640,root,%{httpd_group}) %config(noreplace) %{_sysconfdir}/%{name}/managesieve.inc.php
 
 %files plugin-markasjunk -f plugin-markasjunk.files
 %defattr(-,root,root,-)
-%attr(0640,root,%{httpd_group}) %config(noreplace) %{_sysconfdir}/%{name}/markasjunk.inc.php
 
 %files plugin-new_user_dialog -f plugin-new_user_dialog.files
 %defattr(-,root,root,-)
@@ -3296,9 +2926,6 @@
 %files plugin-http_authentication-assets -f plugin-http_authentication-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-identicon-assets -f plugin-identicon-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-identity_select-assets -f plugin-identity_select-assets.files
 %defattr(-,root,root,-)
 
@@ -3308,6 +2935,9 @@
 %files plugin-krb_authentication-assets -f plugin-krb_authentication-assets.files
 %defattr(-,root,root,-)
 
+%files plugin-legacy_browser-assets -f plugin-legacy_browser-assets.files
+%defattr(-,root,root,-)
+
 %files plugin-managesieve-assets -f plugin-managesieve-assets.files
 %defattr(-,root,root,-)
 
@@ -3353,257 +2983,145 @@
 %files plugin-zipdownload-assets -f plugin-zipdownload-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-acl-skin-elastic -f plugin-acl-skin-elastic.files
+%files plugin-acl-skin-larry -f plugin-acl-skin-larry.files
+%defattr(-,root,root,-)
+
+%files plugin-acl-skin-classic -f plugin-acl-skin-classic.files
 %defattr(-,root,root,-)
 
-%files plugin-acl-skin-larry -f plugin-acl-skin-larry.files
+%files plugin-archive-skin-larry -f plugin-archive-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-enigma-skin-elastic -f plugin-enigma-skin-elastic.files
+%files plugin-archive-skin-classic -f plugin-archive-skin-classic.files
 %defattr(-,root,root,-)
 
 %files plugin-enigma-skin-larry -f plugin-enigma-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-help-skin-elastic -f plugin-help-skin-elastic.files
+%files plugin-enigma-skin-classic -f plugin-enigma-skin-classic.files
 %defattr(-,root,root,-)
 
 %files plugin-help-skin-larry -f plugin-help-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-hide_blockquote-skin-larry -f plugin-hide_blockquote-skin-larry.files
+%files plugin-help-skin-classic -f plugin-help-skin-classic.files
 %defattr(-,root,root,-)
 
-%files plugin-jqueryui-skin-elastic -f plugin-jqueryui-skin-elastic.files
+%files plugin-hide_blockquote-skin-larry -f plugin-hide_blockquote-skin-larry.files
 %defattr(-,root,root,-)
 
 %files plugin-jqueryui-skin-larry -f plugin-jqueryui-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-managesieve-skin-elastic -f plugin-managesieve-skin-elastic.files
+%files plugin-jqueryui-skin-classic -f plugin-jqueryui-skin-classic.files
+%defattr(-,root,root,-)
+
+%files plugin-legacy_browser-skin-larry -f plugin-legacy_browser-skin-larry.files
+%defattr(-,root,root,-)
+
+%files plugin-legacy_browser-skin-classic -f plugin-legacy_browser-skin-classic.files
 %defattr(-,root,root,-)
 
 %files plugin-managesieve-skin-larry -f plugin-managesieve-skin-larry.files
 %defattr(-,root,root,-)
 
+%files plugin-managesieve-skin-classic -f plugin-managesieve-skin-classic.files
+%defattr(-,root,root,-)
+
 %files plugin-markasjunk-skin-larry -f plugin-markasjunk-skin-larry.files
 %defattr(-,root,root,-)
 
+%files plugin-markasjunk-skin-classic -f plugin-markasjunk-skin-classic.files
+%defattr(-,root,root,-)
+
 %files plugin-vcard_attachments-skin-larry -f plugin-vcard_attachments-skin-larry.files
 %defattr(-,root,root,-)
 
+%files plugin-vcard_attachments-skin-classic -f plugin-vcard_attachments-skin-classic.files
+%defattr(-,root,root,-)
+
 %files plugin-zipdownload-skin-larry -f plugin-zipdownload-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-acl-skin-elastic-assets -f plugin-acl-skin-elastic-assets.files
+%files plugin-zipdownload-skin-classic -f plugin-zipdownload-skin-classic.files
 %defattr(-,root,root,-)
 
 %files plugin-acl-skin-larry-assets -f plugin-acl-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-enigma-skin-elastic-assets -f plugin-enigma-skin-elastic-assets.files
+%files plugin-acl-skin-classic-assets -f plugin-acl-skin-classic-assets.files
+%defattr(-,root,root,-)
+
+%files plugin-archive-skin-larry-assets -f plugin-archive-skin-larry-assets.files
+%defattr(-,root,root,-)
+
+%files plugin-archive-skin-classic-assets -f plugin-archive-skin-classic-assets.files
 %defattr(-,root,root,-)
 
 %files plugin-enigma-skin-larry-assets -f plugin-enigma-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-help-skin-elastic-assets -f plugin-help-skin-elastic-assets.files
+%files plugin-enigma-skin-classic-assets -f plugin-enigma-skin-classic-assets.files
 %defattr(-,root,root,-)
 
 %files plugin-help-skin-larry-assets -f plugin-help-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-hide_blockquote-skin-larry-assets -f plugin-hide_blockquote-skin-larry-assets.files
+%files plugin-help-skin-classic-assets -f plugin-help-skin-classic-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-jqueryui-skin-elastic-assets -f plugin-jqueryui-skin-elastic-assets.files
+%files plugin-hide_blockquote-skin-larry-assets -f plugin-hide_blockquote-skin-larry-assets.files
 %defattr(-,root,root,-)
 
 %files plugin-jqueryui-skin-larry-assets -f plugin-jqueryui-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-managesieve-skin-elastic-assets -f plugin-managesieve-skin-elastic-assets.files
+%files plugin-jqueryui-skin-classic-assets -f plugin-jqueryui-skin-classic-assets.files
+%defattr(-,root,root,-)
+
+%files plugin-legacy_browser-skin-larry-assets -f plugin-legacy_browser-skin-larry-assets.files
+%defattr(-,root,root,-)
+
+%files plugin-legacy_browser-skin-classic-assets -f plugin-legacy_browser-skin-classic-assets.files
 %defattr(-,root,root,-)
 
 %files plugin-managesieve-skin-larry-assets -f plugin-managesieve-skin-larry-assets.files
 %defattr(-,root,root,-)
 
+%files plugin-managesieve-skin-classic-assets -f plugin-managesieve-skin-classic-assets.files
+%defattr(-,root,root,-)
+
 %files plugin-markasjunk-skin-larry-assets -f plugin-markasjunk-skin-larry-assets.files
 %defattr(-,root,root,-)
 
+%files plugin-markasjunk-skin-classic-assets -f plugin-markasjunk-skin-classic-assets.files
+%defattr(-,root,root,-)
+
 %files plugin-vcard_attachments-skin-larry-assets -f plugin-vcard_attachments-skin-larry-assets.files
 %defattr(-,root,root,-)
 
+%files plugin-vcard_attachments-skin-classic-assets -f plugin-vcard_attachments-skin-classic-assets.files
+%defattr(-,root,root,-)
+
 %files plugin-zipdownload-skin-larry-assets -f plugin-zipdownload-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files skin-elastic -f skin-elastic.files
+%files plugin-zipdownload-skin-classic-assets -f plugin-zipdownload-skin-classic-assets.files
 %defattr(-,root,root,-)
 
 %files skin-larry -f skin-larry.files
 %defattr(-,root,root,-)
 
-%files skin-elastic-assets -f skin-elastic-assets.files
+%files skin-classic -f skin-classic.files
 %defattr(-,root,root,-)
 
 %files skin-larry-assets -f skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%changelog
-* Tue Nov  7 2023 Christian Mollekopf <mollekopf@apheleia-it.ch> - 1.4.15-2
-- Release of 1.4.15
-
-* Mon Mar  7 2022 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 1.4.13-2
-- Support passwordless keys
-
-* Wed Sep  1 2021 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 1.4.11.20-1
-- Check in release 1.4.11.20
-
-* Tue Apr  6 2021 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 1.4.11.4-1
-- Check in release 1.4.11.4
-
-* Mon Dec 28 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.4.10-1
-- Check in release 1.4.10
-
-* Fri Oct 16 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.4.9.3-1
-- Check in release 1.4.9.3
-
-* Mon Jul  6 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.4.7-1
-- Check in release 1.4.7
-
-* Mon May 11 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.4.4.14-1
-- Check in 14 revisions ahead of upstream 1.4.4 release
-
-* Tue Apr 14 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.4.3.29-1
-- Check in 29 revisions ahead of upstream 1.4.3 release
-
-* Mon Mar  2 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.4.3.6-1
-- Check in 6 revisions ahead of upstream 1.4.3 release
-
-* Wed Dec  4 2019 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.4.1.27-1
-- Check in 27 revisions ahead of upstream 1.4.1 release
-
-* Mon Oct  7 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-312.rc2.12
-- Check in 12 revisions ahead of upstream 1.4-rc2 release
-
-* Mon Jul  1 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-248.rc1.221
-- Check in 221 revisions ahead of the upstream 1.4-rc1 release
-
-* Mon Jun  3 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-246.rc1.167
-- Check in 167 revisions ahead of the upstream 1.4-rc1 release
-
-* Mon May 20 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-242.rc1.133
-- Fix for context menu
-
-* Wed May 15 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-240.rc1.133
-- Check in 133 revisions ahead of the upstream 1.4-rc1 release
-
-* Mon Apr 15 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-236.rc1.65
-- Check in 65 revisions ahead of the upstream rc1 release
-
-* Sat Jan 19 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-206.beta206
-- Check in 206 revisions ahead of the beta release
-
-* Thu Dec  6 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-151.beta151
-- Check in 151 revisions ahead of the beta release
-
-* Thu Nov 22 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-66.beta136
-- Check in 136 revisions ahead of the beta release
-
-* Mon Oct 29 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-50.beta95
-- Check in 95 revisions ahead of the beta release
-
-* Tue Sep 18 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-49.beta36
-- Check in 36 revisions ahead of beta release
-- Conditionally include collabora.inc.php per vhost on Plesk
-
-* Mon Aug 27 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-47.beta3
-- Promote to beta (3 fixes ahead of upstream)
-
-* Sat Aug 18 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-39.alpha8
-- New snapshot
-- Set create_default_folders to true on Plesk
-
-* Thu Jul 12 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-38.alpha7
-- Fix unread icon
-- Use bold font for folders with unread messages
-- New skin thumbnail image
-- Fix search scope selection
-
-* Tue Jun  5 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-36.alpha6
-- Fix toolbars in Safari desktop browser (T110373)
-
-* Thu May 31 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-34.alpha6
-- Check in pre-alpha 1.4 release with Elastic skin
-
-* Tue May 22 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-32.alpha5
-- Check in pre-alpha 1.4 release with Elastic skin
-
-* Tue May 15 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-31.alpha4
-- Check in pre-alpha 1.4 release with Elastic skin
-
-* Mon May 14 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-16.alpha4
-- Check in pre-alpha 1.4 release with Elastic skin
-
-* Fri May  4 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-13.alpha3
-- Check in pre-alpha 1.4 release with Elastic skin
-
-* Mon Apr 30 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-12.alpha2
-- Check in pre-alpha 1.4 release with Elastic skin
-
-* Wed Apr 25 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-9.alpha1
-- Check in pre-alpha 1.4 release with Elastic skin
-
-* Tue Apr 10 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-8.alpha0
-- Check in pre-alpha 1.4 release with Elastic skin
-
-* Thu Apr  5 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.3.5-1
-- Check in 4 revisions ahead of 1.3.5 release
-
-* Thu Mar  8 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.3.4-3
-- Check in 14 revisions ahead of 1.3.4 release
-
-* Wed Feb 28 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.3.4-2
-- Check in 12 revisions ahead of 1.3.4 release
-
-* Sun Feb 11 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.3.4-1
-- Check in upstream 1.3.4 release
-
-* Tue Nov 14 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.3.3-2
-- Stop dropping columns
-
-* Thu Nov  9 2017 Timotheus Pokorra <tp@tbits.net> - 1.3.3-1
-- Check in upstream 1.3.3 release
-
-* Wed Oct  4 2017 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.3.1.12-1
-- Check in 12 revisions ahead of upstream 1.3.1 release
-
-* Sun Aug 27 2017 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.3.0.41-1
-- Check in 41 revisions ahead of upstream 1.3.0 release
-
-* Mon Jun 19 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.2.5-6
-- Fix saving preferences (timezone)
-- Fix syntax error against MariaDB 10.2
-- Fix assets for enigma plugin
-
-* Thu May 25 2017 Timotheus Pokorra <tp@tbits.net> - 1.2.5-5
-- avoid problems on Fedora, roundcubemail-core requires webserver but there are several available
-
-* Wed May 10 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.2.5-2
-- Fix log rotation in Plesk
-
-* Fri Apr 28 2017 Timotheus Pokorra <tp@tbits.net> - 1.2.5-1
-- Check in upstream 1.2.5 release
-
-* Tue Apr 25 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.2.4-4
-- Correct config.inc.php
-
-* Mon Apr 24 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.2.4-2
-- Include licensing.inc.php for Plesk installations
-
-* Wed Mar 15 2017 Timotheus Pokorra <tp@tbits.net> - 1.2.4-1
-- Check in upstream 1.2.4 release
+%files skin-classic-assets -f skin-classic-assets.files
+%defattr(-,root,root,-)
 
+%changelog
 * Wed Nov 30 2016 Timotheus Pokorra <tp@tbits.net> - 1.2.3-1
 - Check in upstream 1.2.3 release

0001-Enigma-Optional-support-for-passwordless-keys-7265.patch Deleted

@@ -1,49 +0,0 @@
-From 3e4a37339e6a4f356f26a47d981ca86a763e4bba Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Tue, 25 May 2021 15:37:57 +0200
-Subject: PATCH Enigma: Optional support for passwordless keys (#7265)
-
----
- plugins/enigma/config.inc.php.dist   | 3 +++
- plugins/enigma/lib/enigma_engine.php | 4 ++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/enigma/config.inc.php.dist b/plugins/enigma/config.inc.php.dist
-index fc620587e..c0c635f3c 100644
---- a/plugins/enigma/config.inc.php.dist
-+++ b/plugins/enigma/config.inc.php.dist
-@@ -65,6 +65,9 @@ $config'enigma_attach_pubkey' = false;
- // When set to 0 passwords will be stored for the whole session.
- $config'enigma_password_time' = 5;
- 
-+// Enable support for private keys without passwords.
-+$config'enigma_passwordless' = false;
-+
- // With this option you can lock composing options
- // of the plugin forcing the user to use configured settings.
- // The array accepts: 'sign', 'encrypt', 'pubkey'.
-diff --git a/plugins/enigma/lib/enigma_engine.php b/plugins/enigma/lib/enigma_engine.php
-index 4dbb464a5..650a0960c 100644
---- a/plugins/enigma/lib/enigma_engine.php
-+++ b/plugins/enigma/lib/enigma_engine.php
-@@ -147,7 +147,7 @@ class enigma_engine
-         $passwords = $this->get_passwords();
-         $pass      = $passwords$key->id;
- 
--        if ($pass === null) {
-+        if ($pass === null && !$this->rc->config->get('enigma_passwordless')) {
-             // ask for password
-             $error = array('missing' => array($key->id => $key->name));
-             return new enigma_error(enigma_error::BADPASS, '', $error);
-@@ -249,7 +249,7 @@ class enigma_engine
-             $passwords = $this->get_passwords();
-             $sign_pass = $passwords$sign_key->id;
- 
--            if ($sign_pass === null) {
-+            if ($sign_pass === null && !$this->rc->config->get('enigma_passwordless')) {
-                 // ask for password
-                 $error = array('missing' => array($sign_key->id => $sign_key->name));
-                 return new enigma_error(enigma_error::BADPASS, '', $error);
--- 
-2.31.1
-

default-configuration.patch Changed

@@ -1,8 +1,17 @@
-diff -ur roundcubemail-1.4.13.orig/config/defaults.inc.php roundcubemail-1.4.13/config/defaults.inc.php
---- roundcubemail-1.4.13.orig/config/defaults.inc.php	2022-01-14 13:06:53.000000000 +0100
-+++ roundcubemail-1.4.13/config/defaults.inc.php	2022-01-14 13:40:38.612763639 +0100
-@@ -692,7 +692,7 @@
- //    RewriteRule ^/roundcubemail/a-zA-Z0-9{16}/(.*) /roundcubemail/$1 PT
+diff -ur roundcubemail-1.2.0.orig/config/defaults.inc.php roundcubemail-1.2.0/config/defaults.inc.php
+--- roundcubemail-1.2.0.orig/config/defaults.inc.php	2016-05-21 13:30:13.000000000 +0200
++++ roundcubemail-1.2.0/config/defaults.inc.php	2016-07-06 15:32:24.191720736 +0200
+@@ -500,7 +500,7 @@
+ // If your authentication backend supports it, use "UTF-8".
+ // Otherwise, use the appropriate character set.
+ // Defaults to ISO-8859-1 for backward compatibility.
+-$config'password_charset' = 'ISO-8859-1';
++$config'password_charset' = 'UTF-8';
+ 
+ // How many seconds must pass between emails sent by a user
+ $config'sendmail_delay' = 0;
+@@ -608,7 +608,7 @@
+ //    RewriteRule ^/roundcubemail/a-f0-9{16}/(.*) /roundcubemail/$1 PT
  //    Alias /roundcubemail /var/www/roundcubemail/
  // Note: Use assets_path to not prevent the browser from caching assets
 -$config'use_secure_urls' = false;
@@ -10,7 +19,7 @@
  
  // Allows to define separate server/path for image/js/css files
  // Warning: If the domain is different cross-domain access to some
-@@ -701,11 +701,11 @@
+@@ -617,11 +617,11 @@
  //    <FilesMatch ".(eot|ttf|woff)">
  //    Header set Access-Control-Allow-Origin "*"
  //    </FilesMatch>
@@ -24,7 +33,7 @@
  
  
  // ----------------------------------
-@@ -799,7 +799,7 @@
+@@ -715,7 +715,7 @@
  // Since Google shut down their public spell checking service, the default settings
  // connect to http://spell.roundcube.net which is a hosted service provided by Roundcube.
  // You can connect to any other googie-compliant service by setting 'spellcheck_uri' accordingly.
@@ -33,7 +42,7 @@
  
  // For locally installed Nox Spell Server or After the Deadline services,
  // please specify the URI to call it.
-@@ -1198,7 +1198,7 @@
+@@ -1113,7 +1113,7 @@
  $config'display_next' = true;
  
  // Default messages listing mode. One of 'threads' or 'list'.
@@ -42,4 +51,4 @@
  
  // 0 - Do not expand threads
  // 1 - Expand all threads automatically
-Only in roundcubemail-1.4.13/config: defaults.inc.php.orig
+Only in roundcubemail-1.2.0/config: defaults.inc.php.orig

roundcubemail-1.4-beta86-plugin-enigma-homedir.patch Deleted

2017111400.sql Deleted

comm.py Changed

debian.changelog Changed

@@ -1,407 +1,3 @@
-roundcubemail (1.4.15-0~kolab5) unstable; urgency=low
-
-  * Release of 1.4.15
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Tue,  7 Nov 2023 11:11:11 +0200
-
-roundcubemail (1.4.13-0~kolab3) unstable; urgency=low
-
-  * Fix `prerm` script
-
- -- Christoph Erhardt <kolab@sicherha.de>  Fri, 19 Aug 2022 17:57:22 +0200
-
-roundcubemail (1.4.13-0~kolab2) unstable; urgency=low
-
-  * Support passwordless keys
-
- -- Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch>  Mon,  7 Mar 2022 11:11:11 +0200
-
-roundcubemail (1.4.13-0~kolab1) unstable; urgency=low
-
-  * Check in 1.4.13
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Fri, 14 Jan 2022 11:11:11 +0200
-
-roundcubemail (1.4.11.20-0~kolab1) unstable; urgency=low
-
-  * Check in 1.4.11.20
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Wed,  1 Sep 2021 11:11:11 +0200
-
-roundcubemail (1.4.11.4-0~kolab1) unstable; urgency=low
-
-  * Check in 1.4.11.4
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Tue,  6 Apr 2021 11:11:11 +0200
-
-roundcubemail (1.4.10-0~kolab1) unstable; urgency=low
-
-  * Check in 1.4.10
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Mon, 28 Dec 2020 11:11:11 +0200
-
-roundcubemail (1.4.9.3-0~kolab2) unstable; urgency=low
-
-  * Check in 1.4.9.3
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Fri, 16 Oct 2020 11:11:11 +0200
-
-roundcubemail (1.4.7-0~kolab2) unstable; urgency=low
-
-  * Check in 1.4.7
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Mon,  6 Jul 2020 11:11:11 +0200
-
-roundcubemail (1.4.4.14-0~kolab2) unstable; urgency=low
-
-  * Check in 14 revisions ahead of upstream 1.4.4 release
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Mon, 11 May 2020 11:11:11 +0200
-
-roundcubemail (1.4.3.29-0~kolab1) unstable; urgency=low
-
-  * Check in 29 revisions ahead of upstream 1.4.3 release
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Tue, 14 Apr 2020 11:11:11 +0200
-
-roundcubemail (1.4.3.6-0~kolab1) unstable; urgency=low
-
-  * Check in 6 revisions ahead of upstream 1.4.3 release
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Mon,  2 Mar 2020 11:11:11 +0200
-
-roundcubemail (1.4.2.11-0~kolab3) unstable; urgency=low
-
-  * Fixed roundcubemail-core postinst script to update database schema on update
-
- -- Daniel Hoffend <dh@dotlan.net>  Sat, 25 Jan 2020 21:41:00 +0100
-
-roundcubemail (1.4.2.11-0~kolab2) unstable; urgency=low
-
-  * Check in 11 revisions ahead of upstream 1.4.2 release
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Tue, 14 Jan 2020 11:11:11 +0200
-
-roundcubemail (1.4.1.27-0~kolab2) unstable; urgency=low
-
-  * Check in 27 revisions ahead of upstream 1.4.1 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  4 Dec 2019 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab316) unstable; urgency=low
-
-  * change ownershow of /var/lib/roundcubemail to www-data group instead of adm
-
- -- Daniel Hoffend <dh@dotlan.net>  Mon, 18 Nov 2019 22:51:00 +0100
-
-roundcubemail (1.4-0~kolab315) unstable; urgency=low
-
-  * Check in 13 revisions ahead of upstream 1.4-rc2 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon,  7 Oct 2019 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab249) unstable; urgency=low
-
-  * Check in 221 revisions ahead of upstream 1.4-rc1 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon,  1 Jul 2019 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab247) unstable; urgency=low
-
-  * Check in 167 revisions ahead of upstream 1.4-rc1 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon,  3 Jun 2019 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab243) unstable; urgency=low
-
-  * Fix for context menu
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 20 May 2019 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab241) unstable; urgency=low
-
-  * Check in 133 revisions ahead of upstream 1.4-rc1 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 15 May 2019 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab239) unstable; urgency=low
-
-  * Check in 127 revisions ahead of upstream 1.4-rc1 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 13 May 2019 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab236) unstable; urgency=low
-
-  * Adjusted roundcubemail.logrotate according to new filenames
-
- -- Christian Mollekopf (Kolab Systems) <mollekopf@kolabys.com>  Mon, 15 Apr 2019 12:12:12 +0100
-
-roundcubemail (1.4-0~kolab235) unstable; urgency=low
-
-  * Switch plesk premium config file inclusion logic
-  * Include kolab_syncroton config if it exists
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 11 Apr 2019 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab233) unstable; urgency=low
-
-  * Check in 27 revisions ahead of upstream 1.4-rc1 release, or 233 revisions ahead of the beta
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 12 Mar 2019 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab206) unstable; urgency=low
-
-  * Check in 206 revisions ahead of upstream 1.4-beta release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sat, 19 Jan 2019 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab151) unstable; urgency=low
-
-  * Check in 151 revisions ahead of upstream 1.4-beta release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  6 Dec 2018 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab136) unstable; urgency=low
-
-  * Check in 136 revisions ahead of upstream 1.4-beta release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 22 Nov 2018 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab53) unstable; urgency=low
-
-  * Check in 95 revisions ahead of upstream 1.4-beta release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 29 Oct 2018 11:11:11 +0200
-
-roundcubemail (1.4.0~kolab51) unstable; urgency=low
-
-  * Add missing watermark.html assets
-
- -- Christoph Erhardt <kolab@sicherha.de>  Tue, 02 Oct 2018 08:41:25 +0200
-
-roundcubemail (1.4-0~kolab50) unstable; urgency=low
-
-  * Require -skin-plesk on Plesk, -skin-chameleon on community, -kolab or -enterprise on Enterprise
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon,  1 Oct 2018 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab49) unstable; urgency=low
-
-  * Check in 36 revisions ahead of beta release
-  * Conditionally include collabora.inc.php per vhost on Plesk
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 18 Sep 2018 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab48) unstable; urgency=low
-
-  * Conditionally include mattermost.inc.php per vhost on Plesk
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  5 Sep 2018 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab47) unstable; urgency=low
-
-  * 3 fixes ahead of beta release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 27 Aug 2018 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab39) unstable; urgency=low
-
-  * New snapshot
-  * Set create_default_folders on Plesk
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sat, 18 Aug 2018 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab38) unstable; urgency=low
-
-  * Fix unread icon
-  * Use bold font for folders with unread messages
-  * New thumbnail image for Elastic skin
-  * Fix search scope
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 12 Jul 2018 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab12) unstable; urgency=low
-
-  * Fix toolbars in Safari desktop browser (T110373)
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue,  5 Jun 2018 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab9) unstable; urgency=low
-
-  * Check in a very early release of 1.4 alpha
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 31 May 2018 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab6) unstable; urgency=low
-
-  * Check in a very early release of 1.4 alpha
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 29 May 2018 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab4) unstable; urgency=low
-
-  * Check in a very early release of 1.4 alpha
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 22 May 2018 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab2) unstable; urgency=low
-
-  * Check in a very early release of 1.4 alpha
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 15 May 2018 11:11:11 +0200
-
-roundcubemail (1.4-0~kolab1) unstable; urgency=low
-
-  * Check in a very early release of 1.4 alpha
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon,  9 Apr 2018 11:11:11 +0200
-
-roundcubemail (1.3.5-0~kolab1) unstable; urgency=low
-
-  * Check in 4 revisions ahead of upstream 1.3.5 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  5 Apr 2018 11:11:11 +0200
-
-roundcubemail (1.3.4-0~kolab3) unstable; urgency=low
-
-  * Check in 14 revisions ahead of upstream 1.3.4 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  8 Mar 2018 11:11:11 +0200
-
-roundcubemail (1.3.4-0~kolab2) unstable; urgency=low
-
-  * Check in 12 revisions ahead of upstream 1.3.4 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 28 Feb 2018 11:11:11 +0200
-
-roundcubemail (1.3.4-0~kolab1) unstable; urgency=low
-
-  * Check in upstream 1.3.4 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sun, 11 Feb 2018 11:11:11 +0200
-
-roundcubemail (1.3.3-0~kolab2) unstable; urgency=low
-
-  * Stop dropping columns
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 14 Nov 2017 11:11:11 +0200
-
-roundcubemail (1.3.3-0~kolab1) unstable; urgency=low
-
-  * Check in upstream 1.3.3 release
-
- -- Timotheus Pokorra <tp@tbits.net>  Thu,  9 Nov 2017 11:11:11 +0200
-
-roundcubemail (1.3.1.12-0~kolab1) unstable; urgency=low
-
-  * Check in 12 revisions ahead of upstream 1.3.1 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  4 Oct 2017 11:11:11 +0200
-
-roundcubemail (1.3.0.41-0~kolab1) unstable; urgency=low
-
-  * Check in 41 revisions ahead of upstream 1.3.0 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sun, 27 Aug 2017 11:11:11 +0200
-
-roundcubemail (1.3.0.34-0~kolab1mic1) unstable; urgency=low
-
-  * fix pbuilder builds
-
- -- hede <kolab983@der-he.de>  Sun, 06 Aug 2017 12:00:12 +0200
-
-roundcubemail (1.3.0.34-0~kolab1) unstable; urgency=low
-
-  * Check in 34 revisions ahead of upstream 1.3.0 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  2 Aug 2017 11:11:11 +0200
-
-roundcubemail (1.3.0-0~kolab1) unstable; urgency=low
-
-  * Check in upstream 1.3.0 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sat,  1 Jul 2017 11:11:11 +0200
-
-roundcubemail (1.2.5-0~kolab6) unstable; urgency=low
-
-  * Fix saving preferences (timezone)
-  * Fix syntax error against MariaDB 10.2
-  * Fix assets for enigma plugin
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 16 Jun 2017 11:11:11 +0200
-
-roundcubemail (1.2.5-0~kolab5) unstable; urgency=low
-
-  * Fix upgrade path
-
- -- Christoph Erhardt <kolab@sicherha.de>  Sun, 14 May 2017 09:53:34 +0200
-
-roundcubemail (1.2.5-0~kolab4) unstable; urgency=low
-
-  * Fix log rotation on Plesk
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 10 May 2017 11:11:11 +0200
-
-roundcubemail (1.2.5-0~kolab3) unstable; urgency=low
-
-  * Fix incomplete move of roundcubemail.conf
-
- -- Christoph Erhardt <kolab@sicherha.de>  Sun, 30 Apr 2017 09:25:24 +0200
-
-roundcubemail (1.2.5-0~kolab2) unstable; urgency=low
-
-  * roundcubemail.conf must be in roundcubemail-core because a2ensite is called in postinst
-
- -- Timotheus Pokorra <tp@tbits.net>  Fri, 28 Apr 2017 08:43:00 +0200
-
-roundcubemail (1.2.5-0~kolab1) unstable; urgency=low
-
-  * Check in upstream 1.2.5 release
-
- -- Timotheus Pokorra <tp@tbits.net>  Fri, 28 Apr 2017 08:42:00 +0200
-
-roundcubemail (1.2.4-0~kolab4) unstable; urgency=low
-
-  * Correct config.inc.php
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 25 Apr 2017 11:11:11 +0200
-
-roundcubemail (1.2.4-0~kolab3) unstable; urgency=low
-
-  * Include licensing.inc.php for Plesk installations
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 24 Apr 2017 11:11:11 +0200
-
-roundcubemail (1.2.4-0~kolab2.4) unstable; urgency=low
-
-  * Fix dependencies and package contents
-
- -- Christoph Erhardt <kolab@sicherha.de>  Sat, 08 Apr 2017 08:52:58 +0200
-
-roundcubemail (1.2.4-0~kolab2.3) unstable; urgency=low
-
-  * Fix packaging semantics
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  5 Apr 2017 11:11:11 +0200
-
-roundcubemail (1.2.4-0~kolab1.16) unstable; urgency=low
-
-  * Check in upstream 1.2.4 release
-
- -- Timotheus Pokorra <tp@tbits.net>  Wed, 15 Mar 2017 08:42:00 +0200
-
-roundcubemail (1.2.3-0~kolab4.16) unstable; urgency=low
-
-  * Enhance packaging
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  8 Feb 2017 07:14:39 +0200
-
-roundcubemail (1.2.3.0-0~kolab3) unstable; urgency=low
-
-  * Fixed Autoloader again
-
- -- Daniel Hoffend <dh@dotlan.net>  Fri, 09 Dec 2016 00:07:00 +0100
-
 roundcubemail (1.2.3.0-0~kolab2) unstable; urgency=low
 
   * Added Autoloader Path for sabre21/Sabre folder

debian.control Changed

@@ -1,9 +1,9 @@
 Source: roundcubemail
 Section: web
 Priority: extra
-Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
-Uploaders: Paul Klos <kolab@klos2day.nl>
-Build-Depends: composer, cssmin, node-uglify, debhelper (>= 8), node-less (>= 1.7.0), psa | bash
+Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth.debian.org>
+Uploaders: Vincent Bernat <bernat@debian.org>, Romain Beauxis <toots@rastageeks.org>, Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
+Build-Depends: composer, debhelper (>= 8)
 Homepage: http://www.roundcube.net/
 Standards-Version: 3.9.3
 Vcs-Git: git://git.kolabsys.com/git/apt/roundcubemail/
@@ -11,49 +11,29 @@
 
 Package: roundcubemail
 Architecture: all
-Depends:    php-net-ldap3,
-            roundcubemail-core,
-            ${misc:Depends}
-Replaces: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
-Conflicts: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
-Provides: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
-Description: skinnable AJAX based webmail solution for IMAP servers
- RoundCube Webmail is a browser-based multilingual IMAP client with an
- application-like user interface. It provides full functionality
- expected from an e-mail client, including MIME support, address book,
- folder manipulation and message filters.
- .
- The user interface is fully skinnable using XHTML and CSS 2.
-
-Package: roundcubemail-core
-Architecture: all
 Depends:    apache2 | httpd,
             libmagic1,
             php-auth-sasl,
             php-mail-mime (>= 1.8.0),
             php-mdb2 (>= 2.5.0),
+            php-net-ldap3,
             php-net-smtp,
             php-net-socket,
             php-net-sieve,
             php-sabre-vobject-3 (>= 3.4.5),
-            php | php5,
-            php-cli | php5-cli,
-            php-gd | php5-gd,
-            php-intl | php5-intl,
-            php-ldap | php5-ldap,
-            php-pspell | php5-pspell,
-            roundcubemail-plugin-acl,
-            roundcubemail-plugin-archive,
-            roundcubemail-plugin-filesystem-attachments,
-            roundcubemail-plugin-jqueryui,
-            roundcubemail-plugin-newmail-notifier,
-            roundcubemail-plugin-password,
-            roundcubemail-plugin-redundant-attachments,
-            roundcubemail-plugin-zipdownload,
-            roundcubemail-plugin-managesieve,
+            php5 | php,
+            php5-cli | php-cli,
+            php5-gd | php-gd,
+            php5-intl | php-intl,
+            php5-ldap | php-ldap,
+            php5-mcrypt | php-mcrypt,
+            php5-pspell | php-pspell,
             ucf,
             ${misc:Depends}
-Description: Core framework package for Roundcube
+Replaces: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
+Conflicts: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
+Provides: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
+Description: skinnable AJAX based webmail solution for IMAP servers
  RoundCube Webmail is a browser-based multilingual IMAP client with an
  application-like user interface. It provides full functionality
  expected from an e-mail client, including MIME support, address book,

debian.rules Changed

@@ -1,73 +1,59 @@
 #!/usr/bin/make -f
 
-DH_VERBOSE=1
-
 %:
 	dh $@
 
 override_dh_auto_build:
-	echo $(CURDIR)
-	find debian/ -type f | sort
-
-	mkdir -p $(CURDIR)/debian/home/.composer/
-	echo '{}' > $(CURDIR)/debian/home/.composer/composer.json
-	patch -p1 < debian/patches/add-composer-autoloader.diff || :
-	if  -x "$$(which composer.sh 2>/dev/null)" ; then \
-		HOME=$(CURDIR)/debian/home/ composer.sh -vvv dumpautoload --optimize ; \
-	else \
-		HOME=$(CURDIR)/debian/home/ composer -vvv dumpautoload --optimize ; \
-	fi
-	sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_psr4.php
-	sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_namespaces.php
-	sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_classmap.php
-	sed -i -e "s|__DIR__ . '/../..' . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_static.php || true
-
-	rm -rvf temp/js_cache/ tests/
-
-	# Parse .less
-	lessc -x ./skins/elastic/styles/styles.less > ./skins/elastic/styles/styles.css
-	lessc -x ./skins/elastic/styles/print.less > ./skins/elastic/styles/print.css
-	lessc -x ./skins/elastic/styles/embed.less > ./skins/elastic/styles/embed.css
+	mkdir -p $HOME/.composer
+	echo '{}' > $HOME/.composer/composer.json
+	patch -p1 < debian/patches/add-composer-autoloader.diff
+	composer.sh -vvv dumpautoload --optimize
+	patch -p1 < debian/patches/fix-composer-autoload-psr4.diff
+	dh_auto_build
+
+override_dh_install:
+	mkdir -p $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
+	cp -a \
+		bin \
+		composer.json-dist \
+		plugins \
+		program \
+		public_html \
+		skins \
+		vendor \
+		$(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
+
+	rm -rf $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/public_html/.htaccess
+
+	install -pm 644 index.php $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
+	install -pm 644 README.md $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
+	install -pm 644 robots.txt $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
 
 	# Compress the CSS
-	for file in `find $(CURDIR)/ -type f -name "*.css" | grep -v /public_html/assets/`; do \
-		asset_loc=$$(dirname $$(echo $${file} | sed \
-				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
-				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
-				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
-			) ; \
-		mkdir -p $${asset_loc} ; \
-		echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \
-		cat $${file} | cssmin > $${asset_loc}/$$(basename $${file}) || \
-			cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
+	for file in `find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "*.css"`; do \
+		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
+		install -pm 755 -d $$asset_loc ; \
+		cat $$file > $$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 $(CURDIR)/ -type f -name "*.js" ! -name "*.min.js" | grep -v /public_html/assets/`; do \
-		asset_loc=$$(dirname $$(echo $${file} | sed \
-				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
-				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
-				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
-			) ; \
-		mkdir -p $${asset_loc} ; \
-		echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \
-		uglifyjs $${file} > $${asset_loc}/$$(basename $${file}) || \
-			cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
+	for file in `find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "*.js" ! -name "*.min.js"`; do \
+		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
+		install -pm 755 -d $$asset_loc ; \
+		cat $$file > $$asset_loc/$$(basename $$file) && rm -rf $$file || \
+		mv -v $$file $$asset_loc/$$(basename $$file); \
 	done
 
-	# The already minied JS can just be copied over to the assets location
-	for file in `find $(CURDIR)/ -type f -name "*.min.js" | grep -v /public_html/assets/`; do \
-		asset_loc=$$(dirname $$(echo $${file} | sed \
-				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
-				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
-				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
-			) ; \
-		mkdir -p $${asset_loc} ; \
-		cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
+	# The already minified JS can just be copied over to the assets location
+	for file in `find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "*.min.js"`; do \
+		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
+		install -pm 755 -d $$asset_loc ; \
+		mv -v $$file $$asset_loc/$$(basename $$file); \
 	done
 
 	# Other assets
-	for file in $$(find $(CURDIR)/plugins/ $(CURDIR)/program/ $(CURDIR)/skins/ -type f \
+	for file in $$(find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f \
 			-name "*.eot" -o \
 			-name "*.gif" -o \
 			-name "*.ico" -o \
@@ -78,84 +64,50 @@
 			-name "*.svg" -o \
 			-name "*.swf" -o \
 			-name "*.tif" -o \
-			-name "*.tiff" -o \
 			-name "*.ttf" -o \
 			-name "*.wav" -o \
-			-name "*.webp" -o \
-			-name "*.woff" -o \
-			-name "*.woff2" \
+			-name "*.woff" \
 		); do \
-		asset_loc=$$(dirname $$(echo $${file} | sed \
-				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
-				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
-				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
-			) ; \
-		mkdir -p $${asset_loc} ; \
-		cp -avf $${file} $${asset_loc}/$$(basename $${file}); \
+		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
+		install -pm 755 -d $$asset_loc ; \
+		mv -f $$file $$asset_loc/$$(basename $$file); \
 	done
 
 	# The watermark.html is an asset, too
-	for skin in classic elastic larry; do \
-		if  -f "$(CURDIR)/skins/$${skin}/watermark.html" ; then \
-			cp -av $(CURDIR)/skins/$${skin}/watermark.html \
-				$(CURDIR)/public_html/assets/skins/$${skin}/watermark.html ; \
-		fi ; \
+	for file in $$(find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "watermark.html" ); do \
+		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
+		install -pm 755 -d $$asset_loc ; \
+		mv -f $$file $$asset_loc/$$(basename $$file); \
 	done
 
-	for plugin in `find $(CURDIR)/plugins/ -type d -mindepth 1 -maxdepth 1 -exec basename {} \;) | sort -u`; do \
-		pkgname=$$(echo $${plugin} | sed -e 's/_/-/g') ; \
-		if  -f "$(CURDIR)/debian/roundcubemail-plugin-$${pkgname}.install" ; then \
-			continue ; \
-		fi ; \
-		if  -f "$(CURDIR)/plugins/$${plugin}/config.inc.php.dist" ; then \
-			mv $(CURDIR)/plugins/$${plugin}/config.inc.php.dist $(CURDIR)/config/$${plugin}.inc.php ; \
-			echo "etc/roundcubemail/$${plugin}.inc.php usr/share/roundcubemail/plugins/$${plugin}/config.inc.php" >> debian/roundcubemail-plugin-$${pkgname}.links ; \
-			echo "config/$${plugin}.inc.php etc/roundcubemail/" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
-		fi ; \
-		if  -d "$(CURDIR)/public_html/assets/plugins/$${plugin}" ; then \
-			echo "public_html/assets/plugins/$${plugin} usr/share/roundcubemail/public_html/assets/plugins" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
-		fi ; \
-		echo "usr/share/roundcubemail/plugins/$${plugin}" >> debian/roundcubemail-plugin-$${pkgname}.dirs ; \
-		echo "plugins/$${plugin} usr/share/roundcubemail/plugins/" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
-		if  -d "$(CURDIR)/plugins/$${plugin}/lib/Roundcube" ; then \
-			echo "usr/share/roundcubemail/plugins/$${plugin}/lib" >> debian/roundcubemail-plugin-$${pkgname}.dirs ; \
-			echo "plugins/$${plugin}/lib/Roundcube usr/share/roundcubemail/plugins/$${plugin}/lib/" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
-		fi ; \
-		echo "" >> debian/control ; \
-		echo "Package: roundcubemail-plugin-$${pkgname}" >> debian/control ; \
-		echo "Architecture: all" >> debian/control ; \
-		echo "Depends: roundcubemail-core" >> debian/control ; \
-		echo "Breaks: roundcubemail (<< 1:1.2.4)" >> debian/control ; \
-		echo "Replaces: roundcubemail (<< 1:1.2.4)" >> debian/control ; \
-		echo "Description: $${plugin} plugin for Roundcube" >> debian/control ; \
-		echo "" >> debian/control ; \
-		sed -i -e "/Files:/ i\
- roundcubemail-plugin-$${plugin} deb web extra" debian/control ; \
-	done
+	mv $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/assets/ \
+		$(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/public_html/assets/ 
 
-	cp -v ../SOURCES/2017111400.sql SQL/mysql/
-
-	if  -f "/etc/plesk-release" ; then \
-		cp -v ../SOURCES/plesk.config.inc.php config/config.inc.php ; \
-		cp -v ../SOURCES/plesk.managesieve.inc.php config/managesieve.inc.php ; \
-		cp -v ../SOURCES/plesk.password.inc.php config/password.inc.php ; \
-		sed -i -e 's/www-data adm/roundcube_sysuser roundcube_sysgroup/g' debian/logrotate ; \
-		echo "misc:Depends:roundcubemail-skin-plesk" >> debian/roundcubemail-core.substvars ; \
-	else \
-		find config/ -type f | sort ; \
-		if  -f "config/config.inc.php.sample" ; then \
-			mv config/config.inc.php.sample config/config.inc.php ; \
-		fi ; \
-		echo "misc:Depends:roundcubemail-skin-chameleon | roundcubemail-skin-kolab | roundcubemail-skin-enterprise" >> debian/roundcubemail-core.substvars ; \
-	fi
+	mkdir -p $(CURDIR)/debian/roundcubemail/etc/roundcubemail/
+	cp -a config/config.inc.php.sample $(CURDIR)/debian/roundcubemail/etc/roundcubemail/config.inc.php
+	cp -a config/defaults.inc.php $(CURDIR)/debian/roundcubemail/etc/roundcubemail/defaults.inc.php
+	cp -a config/mimetypes.php $(CURDIR)/debian/roundcubemail/etc/roundcubemail/mimetypes.php
 
-override_dh_install:
-	if  ! -f "/etc/plesk-release" ; then \
-		mkdir -p $(CURDIR)/debian/roundcubemail-core/etc/apache2/sites-available ; \
-		install -pm 644 $(CURDIR)/debian/conf/roundcubemail.conf $(CURDIR)/debian/roundcubemail-core/etc/apache2/sites-available/roundcubemail.conf ; \
-	fi
+	ln -s ../../../etc/roundcubemail $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/config
+
+	# Fix file permission
+	find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -exec chmod ugo-x {} \;
+	find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/bin/ -type f -exec chmod ugo+x {} \;
+
+	# Copy plugin configuration files to the correct location
+	for conffile in $$(find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/plugins -type f -name "config.inc.php.dist"); do \
+		plugin=$$(basename $$(dirname $$conffile)); \
+		mv $$conffile $(CURDIR)/debian/roundcubemail/etc/roundcubemail/$$plugin.inc.php; \
+		ln -s ../../../../../etc/roundcubemail/$$plugin.inc.php $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/plugins/$$plugin/config.inc.php; \
+	done
+
+	# Create the symbolic links for logs/ and temp/
+	ln -s ../../../var/lib/roundcubemail/ $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/temp
+	ln -s ../../../var/log/roundcubemail/ $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/logs
 
-	dh_install
+	# Install apache2 configuration
+	mkdir -p $(CURDIR)/debian/roundcubemail/etc/apache2/sites-available
+	install -pm 644 $(CURDIR)/debian/conf/roundcubemail.conf $(CURDIR)/debian/roundcubemail/etc/apache2/sites-available/roundcubemail.conf
 
 override_dh_compress:
-	dh_compress -Xsql
+	dh_compress -Xsql

debian.series Changed

debian.tar.gz/dirs Added

debian.tar.gz/docs Added

debian.tar.gz/install Added

debian.tar.gz/patches/add-composer-autoloader.diff Changed

debian.tar.gz/patches/fix-composer-autoload-psr4.diff Added

debian.tar.gz/postinst Added

@@ -0,0 +1,51 @@
+#!/bin/sh
+
+#EXTRA#
+#DEBHELPER#
+
+set -e
+
+fixperms() {
+    chown -R www-data:adm \
+        /var/lib/roundcubemail \
+        /var/log/roundcubemail
+    chmod 750 \
+        /var/lib/roundcubemail \
+        /var/log/roundcubemail
+	chown -R root:www-data /etc/roundcubemail
+	find /etc/roundcubemail -type d -exec chmod u+rwx,g+rx,g-w,o-rwx {} \;
+	find /etc/roundcubemail -type f -exec chmod u+rw,u-x,g+r,g-wx,o-rwx {} \;
+}
+
+reload_apache()
+{
+    if apache2ctl configtest 2>/dev/null; then
+        invoke-rc.d apache2 $1 || true
+    else
+        echo "Your apache2 configuration is broken, so we're not restarting it for you."
+    fi
+}
+
+update_database() {
+    /usr/share/roundcubemail/bin/updatedb.sh \
+        --dir /usr/share/doc/roundcubemail/SQL/ \
+        --package roundcube \
+        >/dev/null 2>&1 || :
+}
+
+
+
+case "$1" in
+    configure)
+        fixperms
+        update_database
+        a2enmod rewrite
+        if  -e "/etc/apache2/sites-available/roundcubemail.conf" -a ! -e "/etc/apache2/sites-enabled/roundcubemail.conf" ; then
+            a2ensite roundcubemail.conf
+            reload_apache reload
+        fi
+    ;;
+esac
+
+exit 0
+

debian.tar.gz/postrm Changed

debian.tar.gz/preinst Changed

debian.tar.gz/prerm Added

debian.tar.gz/roundcubemail-core.dirs Deleted

debian.tar.gz/roundcubemail-core.docs Deleted

debian.tar.gz/roundcubemail-core.install Deleted

debian.tar.gz/roundcubemail-core.links Deleted

debian.tar.gz/roundcubemail-core.postinst Deleted

@@ -1,62 +0,0 @@
-#!/bin/sh
-
-#EXTRA#
-#DEBHELPER#
-
-set -e
-
-fixperms() {
-    # Necessary because update_database() below will otherwise create console.log with the wrong permissions later on.
-    touch /var/log/roundcubemail/console.log
-    touch /var/log/roundcubemail/errors.log
-
-    group=$(getent group roundcube_sysgroup >/dev/null 2>&1 && echo "roundcube_sysgroup" || echo "adm")
-    user=$(getent passwd roundcube_sysuser >/dev/null 2>&1 && echo "roundcube_sysuser" || echo "www-data")
-    chown -R ${user}:${group} /var/log/roundcubemail
-
-    group=$(getent group roundcube_sysgroup >/dev/null 2>&1 && echo "roundcube_sysgroup" || echo "www-data")
-    chown -R ${user}:${group} /var/lib/roundcubemail
-    chown -R root:${group} /etc/roundcubemail
-
-    chmod 750 \
-        /var/lib/roundcubemail \
-        /var/log/roundcubemail
-
-    find /etc/roundcubemail -type d -exec chmod u+rwx,g+rx,g-w,o-rwx {} \;
-    find /etc/roundcubemail -type f -exec chmod u+rw,u-x,g+r,g-wx,o-rwx {} \;
-}
-
-reload_apache()
-{
-    if apache2ctl configtest 2>/dev/null; then
-        invoke-rc.d apache2 $1 || true
-    else
-        echo "Your apache2 configuration is broken, so we're not restarting it for you."
-    fi
-}
-
-update_database() {
-    /usr/share/roundcubemail/bin/updatedb.sh \
-        --dir /usr/share/doc/roundcubemail-core/SQL/ \
-        --package roundcube \
-        >/dev/null 2>&1 || :
-}
-
-case "$1" in
-    configure)
-        fixperms
-        update_database
-        a2enmod rewrite
-
-        sed -i "s/rcmail-\!24ByteDESkey\*Str/`head -c 200 /dev/urandom | tr -dc _A-Z-a-z-0-9 | head -c24`/" \
-            /etc/roundcubemail/defaults.inc.php || : &> /dev/null
-
-        if  -e "/etc/apache2/sites-available/roundcubemail.conf" -a ! -e "/etc/apache2/sites-enabled/roundcubemail.conf" ; then
-            a2ensite roundcubemail.conf
-        fi
-        reload_apache reload
-    ;;
-esac
-
-exit 0
-

debian.tar.gz/roundcubemail-core.prerm Deleted

debian.tar.gz/roundcubemail.docs Deleted

plesk.config.inc.php Deleted

@@ -1,222 +0,0 @@
-<?php
-    include_once("/usr/share/psa-roundcube/config/config.inc.php");
-
-    $components = explode('.', $_SERVER"HTTP_HOST");
-
-    if (count($components) > 2) {
-        array_shift($components);
-    }
-
-    $domain = implode('.', $components);
-
-    $config'session_domain' = $_SERVER"HTTP_HOST";
-    $config'username_domain' = $domain;
-
-    $config'support_url' = "https://www.plesk.com/support/";
-
-    $config'product_name' = "Plesk Premium Email, powered by Kolab";
-
-    $config'default_host' = "localhost";
-    $config'default_port' = 9143;
-
-    $config'smtp_server' = "localhost";
-    $config'smtp_port' = 25;
-    $config'smtp_user' = '%u';
-    $config'smtp_pass' = '%p';
-    $config'smtp_helo_host' = $_SERVER"HTTP_HOST";
-
-    $config'use_secure_urls' = true;
-    $config'force_https' = true;
-
-    $config'assets_path' = "/assets/";
-
-    $config'assets_dir' = "/usr/share/roundcubemail/public_html/assets/";
-
-    $config'imap_cache' = "db";
-    $config'imap_cache_ttl' = "10d";
-
-    $config'message_cache' = null;
-
-    $config'session_storage' = "db";
-
-    $config'skin' = "plesk";
-
-    $config'auto_create_user' = true;
-
-    $config'enable_installer' = false;
-
-    $config'plugins' = Array(
-            'acl',
-            'archive',
-            'calendar',
-            'jqueryui',
-            'kolab_activesync',
-            'kolab_addressbook',
-            'kolab_config',
-            //'kolab_delegation',
-            'kolab_files',
-            'kolab_folders',
-            'kolab_notes',
-            'kolab_tags',
-            'libkolab',
-            'libcalendaring',
-            'managesieve',
-            'markasjunk',
-            'newmail_notifier',
-            'odfviewer',
-            'password',
-            'pdfviewer',
-            'tasklist',
-            'contextmenu',
-        );
-
-    $config'kolabdav_plugins' = Array(
-            'libcalendaring',
-            'libkolab'
-        );
-
-    $config'skip_deleted' = true;
-
-    $config'read_when_deleted' = true;
-    $config'flag_for_deletion' = true;
-    $config'delete_always' = true;
-
-    $config'session_lifetime' = 180;
-    $config'password_charset' = 'UTF-8';
-    $config'useragent' = 'Kolab 16/Roundcube ' . RCUBE_VERSION;
-    $config'refresh_interval' = 300;
-    $config'check_all_folders' = false;
-    $config'dont_override' = Array(
-            'check_all_folders',
-            'refresh_interval',
-            'skin'
-        );
-
-    $config'message_sort_col' = 'date';
-    $config'default_list_mode' = 'threads';
-    $config'autoexpand_threads' = 2;
-
-    $config'message_sort_col' = 'date';
-    $config'default_list_mode' = 'threads';
-    $config'autoexpand_threads' = 2;
-
-    $config'spellcheck_engine' = 'pspell';
-    $config'spellcheck_dictionary' = true;
-    $config'spellcheck_ignore_caps' = true;
-    $config'spellcheck_ignore_nums' = true;
-    $config'spellcheck_ignore_syms' = true;
-    $config'spellcheck_languages' = array(
-            'da' => 'Dansk',
-            'de' => 'Deutsch',
-            'en' => 'English',
-            'es' => 'Español',
-            'fr' => 'Français',
-            'it' => 'Italiano',
-            'nl' => 'Nederlands',
-            'pt' => 'Português',
-            'ru' => 'Русский',
-            'sv' => 'Svenska'
-        );
-
-    $config'undo_timeout' = 10;
-    $config'upload_progress' = 2;
-    $config'address_template' = '{street}<br/>{locality} {zipcode}<br/>{country} {region}';
-    $config'preview_pane' = true;
-    $config'preview_pane_mark_read' = 0;
-
-    // Bottom posting for reply mode
-    $config'reply_mode' = 0;
-    $config'sig_above' = false;
-    $config'mdn_requests' = 0;
-    $config'mdn_default' = false;
-    $config'dsn_default' = false;
-    $config'reply_same_folder' = false;
-
-    $config'performance_stats' = true;
-
-    $config'archive_mbox' = 'Archive';
-    $config'drafts_mbox' = 'Drafts';
-    $config'junk_mbox' = 'INBOX.Spam';
-    $config'sent_mbox' = 'Sent';
-    $config'trash_mbox' = 'Trash';
-
-    $config'create_default_folders' = true;
-    $config'protect_default_folders' = true;
-
-    $config'default_folders' = Array(
-        'INBOX',
-        'Archive',
-        'Drafts',
-        'Sent',
-        'INBOX.Spam',
-        'Trash'
-    );
-
-    $config'skin_include_php' = false;
-    $config'mime_magic' = null;
-    $config'im_identify_path' = '/usr/bin/identify';
-    $config'im_convert_path' = '/usr/bin/convert';
-    $config'log_dir' = 'logs/';
-    $config'temp_dir' = '/tmp';
-
-    $config'log_driver' = 'file';
-    $config'log_date_format' = 'Y-M-d H:i:s O';
-    $config'syslog_id' = 'roundcube';
-    $config'syslog_facility' = LOG_USER;
-    $config'smtp_log' = true;
-    $config'log_logins' = true;
-    $config'log_session' = true;
-    $config'debug_level' = 1;
-    $config'devel_mode' = false;
-    $config'sql_debug' = false;
-    $config'memcache_debug' = false;
-    $config'imap_debug' = false;
-    $config'ldap_debug' = false;
-    $config'smtp_debug' = false;
-
-    $config'fileapi_backend' = "kolab";
-    $config'fileapi_plugins' = Array('kolab_folders');
-    $config'fileapi_manticore' = false;
-    $config'fileapi_wopi_office' = false;
-
-    $config'imap_conn_options' = Array(
-        'ssl' => Array(
-            'verify_peer' => FALSE,
-            'verify_peer_name' => FALSE
-        )
-    );
-
-    $config'smtp_conn_options' = Array(
-        'ssl' => Array(
-            'verify_peer' => FALSE,
-            'verify_peer_name' => FALSE
-        )
-    );
-
-    @include('/etc/roundcubemail/kolab_syncroton.inc.php');
-
-    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/'. basename(__FILE__))) {
-        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/'. basename(__FILE__));
-    }
-
-    // Additional options for Plesk Premium Email - Free
-    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/freemium.inc.php')) {
-        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/freemium.inc.php');
-    }
-
-    // Integration between Plesk Premium Email and Collabora Online extensions
-    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/collabora.inc.php')) {
-        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/collabora.inc.php');
-    }
-
-    // Integration between Plesk Premium Email and Mattermost extensions
-    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/mattermost.inc.php')) {
-        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/mattermost.inc.php');
-    }
-
-    // Integration between Plesk Premium Email and Seafile extensions
-    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/seafile.inc.php')) {
-        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER'HTTP_HOST' .'/seafile.inc.php');
-    }
-
-    @include('/etc/roundcubemail/licensing.inc.php');

plesk.managesieve.inc.php Deleted

@@ -1,30 +0,0 @@
-<?php
-    $config'managesieve_port' = 4190;
-    $config'managesieve_host' = '%h';
-    $config'managesieve_auth_type' = 'PLAIN';
-    $config'managesieve_auth_cid' = null;
-    $config'managesieve_auth_pw' = null;
-    $config'managesieve_usetls' = true;
-    $config'managesieve_default' = '/etc/dovecot/sieve/global';
-    $config'managesieve_mbox_encoding' = 'UTF-8';
-    $config'managesieve_replace_delimiter' = '';
-    $config'managesieve_disabled_extensions' = array();
-    $config'managesieve_debug' = false;
-    $config'managesieve_vacation' = 1;
-    $config'managesieve_domains' = array();
-    $config'managesieve_filename_extension' = '';
-
-    $config'managesieve_conn_options' = Array(
-        'ssl' => Array(
-            'verify_peer' => FALSE,
-            'verify_peer_name' => FALSE
-        )
-    );
-
-    $config'managesieve_kolab_master' = false;
-
-    if (file_exists(RCUBE_CONFIG_DIR . '/' . $_SERVER"HTTP_HOST" . '/' . basename(__FILE__))) {
-        include_once(RCUBE_CONFIG_DIR . '/' . $_SERVER"HTTP_HOST" . '/' . basename(__FILE__));
-    }
-
-?>

plesk.password.inc.php Deleted

roundcubemail-1.4.15.tar.gz -> roundcubemail-1.2.3.tar.gz Changed

roundcubemail.dsc Changed

@@ -2,17 +2,16 @@
 Source: roundcubemail
 Binary: roundcubemail
 Architecture: all
-Version: 1:1.4.15-0~kolab5
-Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
-Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
+Version: 1:1.2.3-0~kolab2
+Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth.debian.org>
+Uploaders: Vincent Bernat <bernat@debian.org>, Romain Beauxis <toots@rastageeks.org>, Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
 Homepage: http://www.roundcube.net/
 Standards-Version: 3.9.3
 Vcs-Browser: http://git.kolabsys.com/apt/roundcubemail/
 Vcs-Git: git://git.kolabsys.com/git/apt/roundcubemail/
-Build-Depends: composer, cssmin, node-uglify, debhelper (>= 8), node-less (>= 1.7.0), psa | bash
-Package-List:
+Build-Depends: composer, debhelper (>= 8)
+Package-List: 
  roundcubemail deb web extra
- roundcubemail-core deb web extra
-Files:
- 00000000000000000000000000000000 0 roundcubemail-1.4.15.tar.gz
+Files: 
+ 00000000000000000000000000000000 0 roundcubemail-1.2.3.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

roundcubemail.logrotate Changed

Build Results
RPM Lint

Refresh

Comments for request 1899 0

Request History

dhoffend created request almost 8 years ago

dhoffend superseded request almost 8 years ago