Projects
Kolab:Winterfell
roundcubemail-plugins-kolab
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 76
View file
roundcubemail-plugins-kolab.spec
Changed
@@ -1,3 +1,5 @@ +%global bootstrap 0 + %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} %if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7 @@ -28,9 +30,16 @@ %global confdir %{_sysconfdir}/roundcubemail %global tmpdir %{_var}/lib/roundcubemail +%global rc_version 3.4 +%global rc_rel_suffix alpha4 +%global dot_rel_suffix %{?rc_rel_suffix:.%{rc_rel_suffix}} +%global dash_rel_suffix %{?rc_rel_suffix:-%{rc_rel_suffix}} + Name: roundcubemail-plugins-kolab -Version: 3.3.6 -Release: 1%{?dist} +Version: 3.4 + +Release: 32%{?dot_rel_suffix}%{?dist} + Summary: Kolab Groupware plugins for Roundcube Webmail Group: Applications/Internet @@ -38,7 +47,7 @@ URL: http://www.kolab.org # From 562ed98bd2e265c0d8a12bd2092b72d85d3e3543 -Source0: https://mirror.kolabenterprise.com/pub/releases/roundcubemail-plugins-kolab-%{version}.tar.gz +Source0: https://mirror.kolabenterprise.com/pub/releases/roundcubemail-plugins-kolab-%{version}%{?dash_rel_suffix}.tar.gz Source1: comm.py Source100: plesk.calendar.inc.php @@ -46,8 +55,6 @@ Source102: plesk.kolab_folders.inc.php Source103: plesk.libkolab.inc.php -Patch0001: 0001-Fix-missing-first-occurrence-of-an-event-when-moved-.patch - Patch1001: roundcubemail-plugins-kolab-3.3-kolab-files-manticore-api.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -61,20 +68,24 @@ BuildRequires: php-justinrainbow-json-schema4 %endif -%if "%{_arch}" != "ppc64" && "%{_arch}" != "ppc64le" && 0%{?suse_version} < 1 +%if "%{_arch}" != "ppc64" && "%{_arch}" != "ppc64le" +BuildRequires: nodejs-less +%if 0%{?suse_version} < 1 BuildRequires: python-cssmin BuildRequires: uglify-js +%endif %else -BuildRequires: roundcubemail(core) +BuildRequires: php-lessphp %endif BuildRequires: python +BuildRequires: roundcubemail(skin-elastic) Requires: php-kolabformat >= 1.0 Requires: php-kolab >= 0.5 Requires: php-pear(HTTP_Request2) %if 0%{?plesk} < 1 -Requires: php-pear(Net_LDAP3) +Requires: php-kolab-net-ldap3 %endif Requires: php-pear(Mail_Mime) >= 1.8.5 Requires: roundcubemail >= %{roundcube_version} @@ -102,14 +113,24 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-calendar-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?fedora} >= 25 -# avoid that plugin-calendar-skin-classic is installed, which is not what we want. that would return an error when loading the calendar -Requires: roundcubemail(plugin-calendar-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?plesk} +Requires: roundcubemail(plugin-calendar-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-plesk) >= 0.4 %else -Requires: roundcubemail(plugin-calendar-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?kolab_enterprise} +%if 0%{?bootstrap} < 1 +Requires: roundcubemail(skin-enterprise) >= 0.3.7 +Requires: roundcubemail(skin-kolab) >= 0.4 +%endif +%else +Requires: roundcubemail(skin-chameleon) >= 0.3.9 +Requires: roundcubemail(plugin-calendar-skin-elastic) >= 1.4 +Requires: roundcubemail(plugin-calendar-skin-larry) >= 1.4 +%endif %endif Requires: roundcubemail(plugin-libcalendaring) = %{?epoch:%{epoch}:}%{version}-%{release} Requires: roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release} Provides: roundcubemail(plugin-calendar) = %{?epoch:%{epoch}:}%{version}-%{release} %description -n roundcubemail-plugin-calendar @@ -120,7 +141,10 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-html_converter-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(plugin-html_converter-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: roundcubemail-plugin-html_converter-skin-elastic < 1.4.0 +Obsoletes: roundcubemail-plugin-html_converter-skin-elastic-assets < 1.4.0 +Obsoletes: roundcubemail-plugin-html_converter-skin-larry < 1.4.0 +Obsoletes: roundcubemail-plugin-html_converter-skin-larry-assets < 1.4.0 Requires: lynx Provides: roundcubemail(plugin-html_converter) = %{?epoch:%{epoch}:}%{version}-%{release} @@ -132,7 +156,21 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-kolab_2fa-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(plugin-kolab_2fa-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?plesk} +Requires: roundcubemail(plugin-kolab_2fa-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-plesk) >= 0.4 +%else +%if 0%{?kolab_enterprise} +%if 0%{?bootstrap} < 1 +Requires: roundcubemail(skin-enterprise) >= 0.3.7 +Requires: roundcubemail(skin-kolab) >= 0.4 +%endif +%else +Requires: roundcubemail(skin-chameleon) >= 0.3.9 +Requires: roundcubemail(plugin-kolab_2fa-skin-elastic) >= 1.4 +Requires: roundcubemail(plugin-kolab_2fa-skin-larry) >= 1.4 +%endif +%endif Requires: php-endroid-qrcode Requires: php-enygma-yubikey Requires: php-spomky-labs-otphp @@ -146,7 +184,21 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-kolab_activesync-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(plugin-kolab_activesync-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?plesk} +Requires: roundcubemail(plugin-kolab_activesync-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-plesk) >= 0.4 +%else +%if 0%{?kolab_enterprise} +%if 0%{?bootstrap} < 1 +Requires: roundcubemail(skin-enterprise) >= 0.3.7 +Requires: roundcubemail(skin-kolab) >= 0.4 +%endif +%else +Requires: roundcubemail(skin-chameleon) >= 0.3.9 +Requires: roundcubemail(plugin-kolab_activesync-skin-elastic) >= 1.4 +Requires: roundcubemail(plugin-kolab_activesync-skin-larry) >= 1.4 +%endif +%endif Requires: roundcubemail(plugin-jqueryui) >= %{roundcube_version} Requires: roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release} Provides: roundcubemail(plugin-kolab_activesync) = %{?epoch:%{epoch}:}%{version}-%{release} @@ -159,7 +211,21 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-kolab_addressbook-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(plugin-kolab_addressbook-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?plesk} +Requires: roundcubemail(plugin-kolab_addressbook-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-plesk) >= 0.4 +%else +%if 0%{?kolab_enterprise} +%if 0%{?bootstrap} < 1 +Requires: roundcubemail(skin-enterprise) >= 0.3.7 +Requires: roundcubemail(skin-kolab) >= 0.4 +%endif +%else +Requires: roundcubemail(skin-chameleon) >= 0.3.9 +Requires: roundcubemail(plugin-kolab_addressbook-skin-elastic) >= 1.4 +Requires: roundcubemail(plugin-kolab_addressbook-skin-larry) >= 1.4 +%endif +%endif Requires: roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release} Provides: roundcubemail(plugin-kolab_addressbook) = %{?epoch:%{epoch}:}%{version}-%{release} @@ -171,6 +237,10 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-kolab_auth-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: roundcubemail-plugin-kolab_auth-skin-elastic < 1.4.0 +Obsoletes: roundcubemail-plugin-kolab_auth-skin-elastic-assets < 1.4.0 +Obsoletes: roundcubemail-plugin-kolab_auth-skin-larry < 1.4.0 +Obsoletes: roundcubemail-plugin-kolab_auth-skin-larry-assets < 1.4.0 Provides: roundcubemail(plugin-kolab_auth) = %{?epoch:%{epoch}:}%{version}-%{release} %description -n roundcubemail-plugin-kolab_auth @@ -181,6 +251,10 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-kolab_config-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: roundcubemail-plugin-kolab_config-skin-elastic < 1.4.0 +Obsoletes: roundcubemail-plugin-kolab_config-skin-elastic-assets < 1.4.0 +Obsoletes: roundcubemail-plugin-kolab_config-skin-larry < 1.4.0 +Obsoletes: roundcubemail-plugin-kolab_config-skin-larry-assets < 1.4.0 Requires: roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release} Provides: roundcubemail(plugin-kolab_config) = %{?epoch:%{epoch}:}%{version}-%{release} @@ -192,7 +266,21 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-kolab_delegation-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(plugin-kolab_delegation-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?plesk} +Requires: roundcubemail(plugin-kolab_delegation-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-plesk) >= 0.4 +%else +%if 0%{?kolab_enterprise} +%if 0%{?bootstrap} < 1 +Requires: roundcubemail(skin-enterprise) >= 0.3.7 +Requires: roundcubemail(skin-kolab) >= 0.4 +%endif +%else +Requires: roundcubemail(skin-chameleon) >= 0.3.9 +Requires: roundcubemail(plugin-kolab_delegation-skin-elastic) >= 1.4 +Requires: roundcubemail(plugin-kolab_delegation-skin-larry) >= 1.4 +%endif +%endif Requires: roundcubemail(plugin-kolab_auth) = %{?epoch:%{epoch}:}%{version}-%{release} Requires: roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release} Provides: roundcubemail(plugin-kolab_delegation) = %{?epoch:%{epoch}:}%{version}-%{release} @@ -205,7 +293,21 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-kolab_files-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(plugin-kolab_files-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?plesk} +Requires: roundcubemail(plugin-kolab_files-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-plesk) >= 0.4 +%else +%if 0%{?kolab_enterprise} +%if 0%{?bootstrap} < 1 +Requires: roundcubemail(skin-enterprise) >= 0.3.7 +Requires: roundcubemail(skin-kolab) >= 0.4 +%endif +%else +Requires: roundcubemail(skin-chameleon) >= 0.3.9 +Requires: roundcubemail(plugin-kolab_files-skin-elastic) >= 1.4 +Requires: roundcubemail(plugin-kolab_files-skin-larry) >= 1.4 +%endif +%endif Requires: roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release} Requires: php-curl Provides: roundcubemail(plugin-kolab_files) = %{?epoch:%{epoch}:}%{version}-%{release} @@ -218,6 +320,10 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-kolab_folders-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: roundcubemail-plugin-kolab_folders-skin-elastic < 1.4.0 +Obsoletes: roundcubemail-plugin-kolab_folders-skin-elastic-assets < 1.4.0 +Obsoletes: roundcubemail-plugin-kolab_folders-skin-larry < 1.4.0 +Obsoletes: roundcubemail-plugin-kolab_folders-skin-larry-assets < 1.4.0 Requires: roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release} Provides: roundcubemail(plugin-kolab_folders) = %{?epoch:%{epoch}:}%{version}-%{release} @@ -229,8 +335,21 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-kolab_notes-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(plugin-kolab_notes-skin) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(plugin-acl) >= %{roundcube_version} +%if 0%{?plesk} +Requires: roundcubemail(plugin-kolab_notes-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-plesk) >= 0.4 +%else +%if 0%{?kolab_enterprise} +%if 0%{?bootstrap} < 1 +Requires: roundcubemail(skin-enterprise) >= 0.3.7 +Requires: roundcubemail(skin-kolab) >= 0.4 +%endif +%else +Requires: roundcubemail(skin-chameleon) >= 0.3.9 +Requires: roundcubemail(plugin-kolab_notes-skin-elastic) >= 1.4 +Requires: roundcubemail(plugin-kolab_notes-skin-larry) >= 1.4 +%endif +%endif Requires: roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release} Provides: roundcubemail(plugin-kolab_notes) = %{?epoch:%{epoch}:}%{version}-%{release} @@ -242,6 +361,10 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-kolab_shortcuts-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: roundcubemail-plugin-kolab_shortcuts-skin-elastic < 1.4.0 +Obsoletes: roundcubemail-plugin-kolab_shortcuts-skin-elastic-assets < 1.4.0 +Obsoletes: roundcubemail-plugin-kolab_shortcuts-skin-larry < 1.4.0 +Obsoletes: roundcubemail-plugin-kolab_shortcuts-skin-larry-assets < 1.4.0 Provides: roundcubemail(plugin-kolab_shortcuts) = %{?epoch:%{epoch}:}%{version}-%{release} %description -n roundcubemail-plugin-kolab_shortcuts @@ -252,7 +375,21 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-kolab_tags-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(plugin-kolab_tags-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?plesk} +Requires: roundcubemail(plugin-kolab_tags-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-plesk) >= 0.4 +%else +%if 0%{?kolab_enterprise} +%if 0%{?bootstrap} < 1 +Requires: roundcubemail(skin-enterprise) >= 0.3.7 +Requires: roundcubemail(skin-kolab) >= 0.4 +%endif +%else +Requires: roundcubemail(skin-chameleon) >= 0.3.9 +Requires: roundcubemail(plugin-kolab_tags-skin-elastic) >= 1.4 +Requires: roundcubemail(plugin-kolab_tags-skin-larry) >= 1.4 +%endif +%endif Requires: roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release} Provides: roundcubemail(plugin-kolab_tags) = %{?epoch:%{epoch}:}%{version}-%{release} @@ -264,6 +401,10 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-ldap_authentication-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: roundcubemail-plugin-ldap_authentication-skin-elastic < 1.4.0 +Obsoletes: roundcubemail-plugin-ldap_authentication-skin-elastic-assets < 1.4.0 +Obsoletes: roundcubemail-plugin-ldap_authentication-skin-larry < 1.4.0 +Obsoletes: roundcubemail-plugin-ldap_authentication-skin-larry-assets < 1.4.0 Provides: roundcubemail(plugin-ldap_authentication) = %{?epoch:%{epoch}:}%{version}-%{release} %description -n roundcubemail-plugin-ldap_authentication @@ -272,10 +413,26 @@ %package -n roundcubemail-plugin-libcalendaring Summary: Plugin libcalendaring Group: Applications/Internet -Requires: php-sabre-vobject Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-libcalendaring-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(plugin-libcalendaring-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?plesk} +Obsoletes: roundcubemail-plugin-libcalendaring-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: roundcubemail-plugin-libcalendaring-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-plesk) >= 0.4 +%else +%if 0%{?kolab_enterprise} +%if 0%{?bootstrap} < 1 +Requires: roundcubemail(skin-enterprise) >= 0.3.7 +Requires: roundcubemail(skin-kolab) >= 0.4 +%endif +Obsoletes: roundcubemail-plugin-libcalendaring-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: roundcubemail-plugin-libcalendaring-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release} +%else +Requires: roundcubemail(skin-chameleon) >= 0.3.9 +Requires: roundcubemail(plugin-libcalendaring-skin-elastic) >= 1.4 +Requires: roundcubemail(plugin-libcalendaring-skin-larry) >= 1.4 +%endif +%endif Provides: roundcubemail(plugin-libcalendaring) = %{?epoch:%{epoch}:}%{version}-%{release} %description -n roundcubemail-plugin-libcalendaring @@ -286,7 +443,21 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-libkolab-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(plugin-libkolab-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?plesk} +Requires: roundcubemail(plugin-libkolab-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-plesk) >= 0.4 +%else +%if 0%{?kolab_enterprise} +%if 0%{?bootstrap} < 1 +Requires: roundcubemail(skin-enterprise) >= 0.3.7 +Requires: roundcubemail(skin-kolab) >= 0.4 +%endif +%else +Requires: roundcubemail(skin-chameleon) >= 0.3.9 +Requires: roundcubemail(plugin-libkolab-skin-elastic) >= 1.4 +Requires: roundcubemail(plugin-libkolab-skin-larry) >= 1.4 +%endif +%endif Provides: roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release} %description -n roundcubemail-plugin-libkolab @@ -297,6 +468,10 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-loginfail-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: roundcubemail-plugin-loginfail-skin-elastic < 1.4.0 +Obsoletes: roundcubemail-plugin-loginfail-skin-elastic-assets < 1.4.0 +Obsoletes: roundcubemail-plugin-loginfail-skin-larry < 1.4.0 +Obsoletes: roundcubemail-plugin-loginfail-skin-larry-assets < 1.4.0 Provides: roundcubemail(plugin-loginfail) = %{?epoch:%{epoch}:}%{version}-%{release} %description -n roundcubemail-plugin-loginfail @@ -307,6 +482,10 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-logon_page-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: roundcubemail-plugin-logon_page-skin-elastic < 1.4.0 +Obsoletes: roundcubemail-plugin-logon_page-skin-elastic-assets < 1.4.0 +Obsoletes: roundcubemail-plugin-logon_page-skin-larry < 1.4.0 +Obsoletes: roundcubemail-plugin-logon_page-skin-larry-assets < 1.4.0 Provides: roundcubemail(plugin-logon_page) = %{?epoch:%{epoch}:}%{version}-%{release} %description -n roundcubemail-plugin-logon_page @@ -317,6 +496,10 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-odfviewer-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: roundcubemail-plugin-odfviewer-skin-elastic < 1.4.0 +Obsoletes: roundcubemail-plugin-odfviewer-skin-elastic-assets < 1.4.0 +Obsoletes: roundcubemail-plugin-odfviewer-skin-larry < 1.4.0 +Obsoletes: roundcubemail-plugin-odfviewer-skin-larry-assets < 1.4.0 Provides: roundcubemail(plugin-odfviewer) = %{?epoch:%{epoch}:}%{version}-%{release} %description -n roundcubemail-plugin-odfviewer @@ -327,6 +510,10 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-pdfviewer-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: roundcubemail-plugin-pdfviewer-skin-elastic < 1.4.0 +Obsoletes: roundcubemail-plugin-pdfviewer-skin-elastic-assets < 1.4.0 +Obsoletes: roundcubemail-plugin-pdfviewer-skin-larry < 1.4.0 +Obsoletes: roundcubemail-plugin-pdfviewer-skin-larry-assets < 1.4.0 Provides: roundcubemail(plugin-pdfviewer) = %{?epoch:%{epoch}:}%{version}-%{release} %description -n roundcubemail-plugin-pdfviewer @@ -337,6 +524,10 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-piwik_analytics-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: roundcubemail-plugin-piwik_analytics-skin-elastic < 1.4.0 +Obsoletes: roundcubemail-plugin-piwik_analytics-skin-elastic-assets < 1.4.0 +Obsoletes: roundcubemail-plugin-piwik_analytics-skin-larry < 1.4.0 +Obsoletes: roundcubemail-plugin-piwik_analytics-skin-larry-assets < 1.4.0 Provides: roundcubemail(plugin-piwik_analytics) = %{?epoch:%{epoch}:}%{version}-%{release} %description -n roundcubemail-plugin-piwik_analytics @@ -347,8 +538,21 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-tasklist-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(plugin-tasklist-skin) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(plugin-acl) >= %{roundcube_version} +%if 0%{?plesk} +Requires: roundcubemail(plugin-tasklist-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-plesk) >= 0.4 +%else +%if 0%{?kolab_enterprise} +%if 0%{?bootstrap} < 1 +Requires: roundcubemail(skin-enterprise) >= 0.3.7 +Requires: roundcubemail(skin-kolab) >= 0.4 +%endif +%else +Requires: roundcubemail(skin-chameleon) >= 0.3.9 +Requires: roundcubemail(plugin-tasklist-skin-elastic) >= 1.4 +Requires: roundcubemail(plugin-tasklist-skin-larry) >= 1.4 +%endif +%endif Requires: roundcubemail(plugin-jqueryui) >= %{roundcube_version} Requires: roundcubemail(plugin-libcalendaring) = %{?epoch:%{epoch}:}%{version}-%{release} Requires: roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release} @@ -362,6 +566,10 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-tinymce_config-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: roundcubemail-plugin-tinymce_config-skin-elastic < 1.4.0 +Obsoletes: roundcubemail-plugin-tinymce_config-skin-elastic-assets < 1.4.0 +Obsoletes: roundcubemail-plugin-tinymce_config-skin-larry < 1.4.0 +Obsoletes: roundcubemail-plugin-tinymce_config-skin-larry-assets < 1.4.0 Provides: roundcubemail(plugin-tinymce_config) = %{?epoch:%{epoch}:}%{version}-%{release} %description -n roundcubemail-plugin-tinymce_config @@ -372,6 +580,11 @@ Group: Applications/Internet Requires: roundcubemail(core) >= %{roundcube_version} Requires: roundcubemail(plugin-wap_client-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: roundcubemail-plugin-wap_client-skin-elastic < 1.4.0 +Obsoletes: roundcubemail-plugin-wap_client-skin-elastic-assets < 1.4.0 +Obsoletes: roundcubemail-plugin-wap_client-skin-larry < 1.4.0 +Obsoletes: roundcubemail-plugin-wap_client-skin-larry-assets < 1.4.0 +Requires: roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release} Provides: roundcubemail(plugin-wap_client) = %{?epoch:%{epoch}:}%{version}-%{release} %description -n roundcubemail-plugin-wap_client @@ -385,6 +598,14 @@ %description -n roundcubemail-plugin-calendar-assets Plugin calendar Assets +%package -n roundcubemail-plugin-html_converter-assets +Summary: Plugin html_converter Assets +Group: Applications/Internet +Provides: roundcubemail(plugin-html_converter-assets) = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n roundcubemail-plugin-html_converter-assets +Plugin html_converter Assets + %package -n roundcubemail-plugin-kolab_2fa-assets Summary: Plugin kolab_2fa Assets Group: Applications/Internet @@ -561,6 +782,18 @@ %description -n roundcubemail-plugin-wap_client-assets Plugin wap_client Assets +%package -n roundcubemail-plugin-calendar-skin-elastic +Summary: Plugin calendar / Skin elastic +Group: Applications/Internet +Requires: roundcubemail(plugin-calendar) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-elastic) >= %{roundcube_version} +Requires: roundcubemail(plugin-calendar-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-calendar-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-calendar-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n roundcubemail-plugin-calendar-skin-elastic +Plugin calendar / Skin elastic + %package -n roundcubemail-plugin-calendar-skin-larry Summary: Plugin calendar / Skin larry Group: Applications/Internet @@ -573,17 +806,17 @@ %description -n roundcubemail-plugin-calendar-skin-larry Plugin calendar / Skin larry -%package -n roundcubemail-plugin-calendar-skin-classic -Summary: Plugin calendar / Skin classic +%package -n roundcubemail-plugin-kolab_2fa-skin-elastic +Summary: Plugin kolab_2fa / Skin elastic Group: Applications/Internet -Requires: roundcubemail(plugin-calendar) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(skin-classic) >= %{roundcube_version} -Requires: roundcubemail(plugin-calendar-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: roundcubemail(plugin-calendar-skin) = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: roundcubemail(plugin-calendar-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(plugin-kolab_2fa) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-elastic) >= %{roundcube_version} +Requires: roundcubemail(plugin-kolab_2fa-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_2fa-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_2fa-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n roundcubemail-plugin-calendar-skin-classic -Plugin calendar / Skin classic +%description -n roundcubemail-plugin-kolab_2fa-skin-elastic +Plugin kolab_2fa / Skin elastic %package -n roundcubemail-plugin-kolab_2fa-skin-larry Summary: Plugin kolab_2fa / Skin larry @@ -597,6 +830,18 @@ %description -n roundcubemail-plugin-kolab_2fa-skin-larry Plugin kolab_2fa / Skin larry +%package -n roundcubemail-plugin-kolab_activesync-skin-elastic +Summary: Plugin kolab_activesync / Skin elastic +Group: Applications/Internet +Requires: roundcubemail(plugin-kolab_activesync) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-elastic) >= %{roundcube_version} +Requires: roundcubemail(plugin-kolab_activesync-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_activesync-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_activesync-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n roundcubemail-plugin-kolab_activesync-skin-elastic +Plugin kolab_activesync / Skin elastic + %package -n roundcubemail-plugin-kolab_activesync-skin-larry Summary: Plugin kolab_activesync / Skin larry Group: Applications/Internet @@ -609,17 +854,17 @@ %description -n roundcubemail-plugin-kolab_activesync-skin-larry Plugin kolab_activesync / Skin larry -%package -n roundcubemail-plugin-kolab_activesync-skin-classic -Summary: Plugin kolab_activesync / Skin classic +%package -n roundcubemail-plugin-kolab_addressbook-skin-elastic +Summary: Plugin kolab_addressbook / Skin elastic Group: Applications/Internet -Requires: roundcubemail(plugin-kolab_activesync) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(skin-classic) >= %{roundcube_version} -Requires: roundcubemail(plugin-kolab_activesync-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: roundcubemail(plugin-kolab_activesync-skin) = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: roundcubemail(plugin-kolab_activesync-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(plugin-kolab_addressbook) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-elastic) >= %{roundcube_version} +Requires: roundcubemail(plugin-kolab_addressbook-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_addressbook-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_addressbook-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n roundcubemail-plugin-kolab_activesync-skin-classic -Plugin kolab_activesync / Skin classic +%description -n roundcubemail-plugin-kolab_addressbook-skin-elastic +Plugin kolab_addressbook / Skin elastic %package -n roundcubemail-plugin-kolab_addressbook-skin-larry Summary: Plugin kolab_addressbook / Skin larry @@ -633,17 +878,17 @@ %description -n roundcubemail-plugin-kolab_addressbook-skin-larry Plugin kolab_addressbook / Skin larry -%package -n roundcubemail-plugin-kolab_addressbook-skin-classic -Summary: Plugin kolab_addressbook / Skin classic +%package -n roundcubemail-plugin-kolab_delegation-skin-elastic +Summary: Plugin kolab_delegation / Skin elastic Group: Applications/Internet -Requires: roundcubemail(plugin-kolab_addressbook) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(skin-classic) >= %{roundcube_version} -Requires: roundcubemail(plugin-kolab_addressbook-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: roundcubemail(plugin-kolab_addressbook-skin) = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: roundcubemail(plugin-kolab_addressbook-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(plugin-kolab_delegation) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-elastic) >= %{roundcube_version} +Requires: roundcubemail(plugin-kolab_delegation-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_delegation-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_delegation-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n roundcubemail-plugin-kolab_addressbook-skin-classic -Plugin kolab_addressbook / Skin classic +%description -n roundcubemail-plugin-kolab_delegation-skin-elastic +Plugin kolab_delegation / Skin elastic %package -n roundcubemail-plugin-kolab_delegation-skin-larry Summary: Plugin kolab_delegation / Skin larry @@ -657,17 +902,17 @@ %description -n roundcubemail-plugin-kolab_delegation-skin-larry Plugin kolab_delegation / Skin larry -%package -n roundcubemail-plugin-kolab_delegation-skin-classic -Summary: Plugin kolab_delegation / Skin classic +%package -n roundcubemail-plugin-kolab_files-skin-elastic +Summary: Plugin kolab_files / Skin elastic Group: Applications/Internet -Requires: roundcubemail(plugin-kolab_delegation) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(skin-classic) >= %{roundcube_version} -Requires: roundcubemail(plugin-kolab_delegation-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: roundcubemail(plugin-kolab_delegation-skin) = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: roundcubemail(plugin-kolab_delegation-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(plugin-kolab_files) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-elastic) >= %{roundcube_version} +Requires: roundcubemail(plugin-kolab_files-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_files-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_files-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n roundcubemail-plugin-kolab_delegation-skin-classic -Plugin kolab_delegation / Skin classic +%description -n roundcubemail-plugin-kolab_files-skin-elastic +Plugin kolab_files / Skin elastic %package -n roundcubemail-plugin-kolab_files-skin-larry Summary: Plugin kolab_files / Skin larry @@ -681,6 +926,18 @@ %description -n roundcubemail-plugin-kolab_files-skin-larry Plugin kolab_files / Skin larry +%package -n roundcubemail-plugin-kolab_notes-skin-elastic +Summary: Plugin kolab_notes / Skin elastic +Group: Applications/Internet +Requires: roundcubemail(plugin-kolab_notes) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-elastic) >= %{roundcube_version} +Requires: roundcubemail(plugin-kolab_notes-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_notes-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_notes-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n roundcubemail-plugin-kolab_notes-skin-elastic +Plugin kolab_notes / Skin elastic + %package -n roundcubemail-plugin-kolab_notes-skin-larry Summary: Plugin kolab_notes / Skin larry Group: Applications/Internet @@ -693,6 +950,18 @@ %description -n roundcubemail-plugin-kolab_notes-skin-larry Plugin kolab_notes / Skin larry +%package -n roundcubemail-plugin-kolab_tags-skin-elastic +Summary: Plugin kolab_tags / Skin elastic +Group: Applications/Internet +Requires: roundcubemail(plugin-kolab_tags) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-elastic) >= %{roundcube_version} +Requires: roundcubemail(plugin-kolab_tags-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_tags-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_tags-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n roundcubemail-plugin-kolab_tags-skin-elastic +Plugin kolab_tags / Skin elastic + %package -n roundcubemail-plugin-kolab_tags-skin-larry Summary: Plugin kolab_tags / Skin larry Group: Applications/Internet @@ -705,6 +974,54 @@ %description -n roundcubemail-plugin-kolab_tags-skin-larry Plugin kolab_tags / Skin larry +%package -n roundcubemail-plugin-libcalendaring-skin-larry +Summary: Plugin libcalendaring / Skin larry +Group: Applications/Internet +Requires: roundcubemail(plugin-libcalendaring) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-larry) >= %{roundcube_version} +Requires: roundcubemail(plugin-libcalendaring-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-libcalendaring-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-libcalendaring-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n roundcubemail-plugin-libcalendaring-skin-larry +Plugin libcalendaring / Skin larry + +%package -n roundcubemail-plugin-libkolab-skin-elastic +Summary: Plugin libkolab / Skin elastic +Group: Applications/Internet +Requires: roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-elastic) >= %{roundcube_version} +Requires: roundcubemail(plugin-libkolab-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-libkolab-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-libkolab-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n roundcubemail-plugin-libkolab-skin-elastic +Plugin libkolab / Skin elastic + +%package -n roundcubemail-plugin-libkolab-skin-larry +Summary: Plugin libkolab / Skin larry +Group: Applications/Internet +Requires: roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-larry) >= %{roundcube_version} +Requires: roundcubemail(plugin-libkolab-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-libkolab-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-libkolab-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n roundcubemail-plugin-libkolab-skin-larry +Plugin libkolab / Skin larry + +%package -n roundcubemail-plugin-tasklist-skin-elastic +Summary: Plugin tasklist / Skin elastic +Group: Applications/Internet +Requires: roundcubemail(plugin-tasklist) = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: roundcubemail(skin-elastic) >= %{roundcube_version} +Requires: roundcubemail(plugin-tasklist-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-tasklist-skin) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-tasklist-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n roundcubemail-plugin-tasklist-skin-elastic +Plugin tasklist / Skin elastic + %package -n roundcubemail-plugin-tasklist-skin-larry Summary: Plugin tasklist / Skin larry Group: Applications/Internet @@ -717,6 +1034,14 @@ %description -n roundcubemail-plugin-tasklist-skin-larry Plugin tasklist / Skin larry +%package -n roundcubemail-plugin-calendar-skin-elastic-assets +Summary: Plugin calendar / Skin elastic (Assets) +Group: Applications/Internet +Provides: roundcubemail(plugin-calendar-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n roundcubemail-plugin-calendar-skin-elastic-assets +Plugin calendar / Skin elastic (Assets Package) + %package -n roundcubemail-plugin-calendar-skin-larry-assets Summary: Plugin calendar / Skin larry (Assets) Group: Applications/Internet @@ -725,13 +1050,13 @@ %description -n roundcubemail-plugin-calendar-skin-larry-assets Plugin calendar / Skin larry (Assets Package) -%package -n roundcubemail-plugin-calendar-skin-classic-assets -Summary: Plugin calendar / Skin classic (Assets) +%package -n roundcubemail-plugin-kolab_2fa-skin-elastic-assets +Summary: Plugin kolab_2fa / Skin elastic (Assets) Group: Applications/Internet -Provides: roundcubemail(plugin-calendar-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_2fa-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n roundcubemail-plugin-calendar-skin-classic-assets -Plugin calendar / Skin classic (Assets Package) +%description -n roundcubemail-plugin-kolab_2fa-skin-elastic-assets +Plugin kolab_2fa / Skin elastic (Assets Package) %package -n roundcubemail-plugin-kolab_2fa-skin-larry-assets Summary: Plugin kolab_2fa / Skin larry (Assets) @@ -741,6 +1066,14 @@ %description -n roundcubemail-plugin-kolab_2fa-skin-larry-assets Plugin kolab_2fa / Skin larry (Assets Package) +%package -n roundcubemail-plugin-kolab_activesync-skin-elastic-assets +Summary: Plugin kolab_activesync / Skin elastic (Assets) +Group: Applications/Internet +Provides: roundcubemail(plugin-kolab_activesync-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n roundcubemail-plugin-kolab_activesync-skin-elastic-assets +Plugin kolab_activesync / Skin elastic (Assets Package) + %package -n roundcubemail-plugin-kolab_activesync-skin-larry-assets Summary: Plugin kolab_activesync / Skin larry (Assets) Group: Applications/Internet @@ -749,13 +1082,13 @@ %description -n roundcubemail-plugin-kolab_activesync-skin-larry-assets Plugin kolab_activesync / Skin larry (Assets Package) -%package -n roundcubemail-plugin-kolab_activesync-skin-classic-assets -Summary: Plugin kolab_activesync / Skin classic (Assets) +%package -n roundcubemail-plugin-kolab_addressbook-skin-elastic-assets +Summary: Plugin kolab_addressbook / Skin elastic (Assets) Group: Applications/Internet -Provides: roundcubemail(plugin-kolab_activesync-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_addressbook-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n roundcubemail-plugin-kolab_activesync-skin-classic-assets -Plugin kolab_activesync / Skin classic (Assets Package) +%description -n roundcubemail-plugin-kolab_addressbook-skin-elastic-assets +Plugin kolab_addressbook / Skin elastic (Assets Package) %package -n roundcubemail-plugin-kolab_addressbook-skin-larry-assets Summary: Plugin kolab_addressbook / Skin larry (Assets) @@ -765,13 +1098,13 @@ %description -n roundcubemail-plugin-kolab_addressbook-skin-larry-assets Plugin kolab_addressbook / Skin larry (Assets Package) -%package -n roundcubemail-plugin-kolab_addressbook-skin-classic-assets -Summary: Plugin kolab_addressbook / Skin classic (Assets) +%package -n roundcubemail-plugin-kolab_delegation-skin-elastic-assets +Summary: Plugin kolab_delegation / Skin elastic (Assets) Group: Applications/Internet -Provides: roundcubemail(plugin-kolab_addressbook-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_delegation-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n roundcubemail-plugin-kolab_addressbook-skin-classic-assets -Plugin kolab_addressbook / Skin classic (Assets Package) +%description -n roundcubemail-plugin-kolab_delegation-skin-elastic-assets +Plugin kolab_delegation / Skin elastic (Assets Package) %package -n roundcubemail-plugin-kolab_delegation-skin-larry-assets Summary: Plugin kolab_delegation / Skin larry (Assets) @@ -781,13 +1114,13 @@ %description -n roundcubemail-plugin-kolab_delegation-skin-larry-assets Plugin kolab_delegation / Skin larry (Assets Package) -%package -n roundcubemail-plugin-kolab_delegation-skin-classic-assets -Summary: Plugin kolab_delegation / Skin classic (Assets) +%package -n roundcubemail-plugin-kolab_files-skin-elastic-assets +Summary: Plugin kolab_files / Skin elastic (Assets) Group: Applications/Internet -Provides: roundcubemail(plugin-kolab_delegation-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: roundcubemail(plugin-kolab_files-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n roundcubemail-plugin-kolab_delegation-skin-classic-assets -Plugin kolab_delegation / Skin classic (Assets Package) +%description -n roundcubemail-plugin-kolab_files-skin-elastic-assets +Plugin kolab_files / Skin elastic (Assets Package) %package -n roundcubemail-plugin-kolab_files-skin-larry-assets Summary: Plugin kolab_files / Skin larry (Assets) @@ -797,6 +1130,14 @@ %description -n roundcubemail-plugin-kolab_files-skin-larry-assets Plugin kolab_files / Skin larry (Assets Package) +%package -n roundcubemail-plugin-kolab_notes-skin-elastic-assets +Summary: Plugin kolab_notes / Skin elastic (Assets) +Group: Applications/Internet +Provides: roundcubemail(plugin-kolab_notes-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n roundcubemail-plugin-kolab_notes-skin-elastic-assets +Plugin kolab_notes / Skin elastic (Assets Package) + %package -n roundcubemail-plugin-kolab_notes-skin-larry-assets Summary: Plugin kolab_notes / Skin larry (Assets) Group: Applications/Internet @@ -805,6 +1146,14 @@ %description -n roundcubemail-plugin-kolab_notes-skin-larry-assets Plugin kolab_notes / Skin larry (Assets Package) +%package -n roundcubemail-plugin-kolab_tags-skin-elastic-assets +Summary: Plugin kolab_tags / Skin elastic (Assets) +Group: Applications/Internet +Provides: roundcubemail(plugin-kolab_tags-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n roundcubemail-plugin-kolab_tags-skin-elastic-assets +Plugin kolab_tags / Skin elastic (Assets Package) + %package -n roundcubemail-plugin-kolab_tags-skin-larry-assets Summary: Plugin kolab_tags / Skin larry (Assets) Group: Applications/Internet @@ -816,29 +1165,35 @@ %package -n roundcubemail-plugin-libcalendaring-skin-larry-assets Summary: Plugin libcalendaring / Skin larry (Assets) Group: Applications/Internet -Requires: roundcubemail(plugin-libcalendaring) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(skin-larry) >= %{roundcube_version} -Obsoletes: roundcubemail-plugin-libcalendaring-skin-larry -Provides: roundcubemail(plugin-libcalendaring-skin) = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: roundcubemail(plugin-libcalendaring-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release} Provides: roundcubemail(plugin-libcalendaring-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release} %description -n roundcubemail-plugin-libcalendaring-skin-larry-assets Plugin libcalendaring / Skin larry (Assets Package) +%package -n roundcubemail-plugin-libkolab-skin-elastic-assets +Summary: Plugin libkolab / Skin elastic (Assets) +Group: Applications/Internet +Provides: roundcubemail(plugin-libkolab-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n roundcubemail-plugin-libkolab-skin-elastic-assets +Plugin libkolab / Skin elastic (Assets Package) + %package -n roundcubemail-plugin-libkolab-skin-larry-assets Summary: Plugin libkolab / Skin larry (Assets) Group: Applications/Internet -Requires: roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: roundcubemail(skin-larry) >= %{roundcube_version} -Obsoletes: roundcubemail-plugin-libkolab-skin-larry -Provides: roundcubemail(plugin-libkolab-skin) = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: roundcubemail(plugin-libkolab-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release} Provides: roundcubemail(plugin-libkolab-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release} %description -n roundcubemail-plugin-libkolab-skin-larry-assets Plugin libkolab / Skin larry (Assets Package) +%package -n roundcubemail-plugin-tasklist-skin-elastic-assets +Summary: Plugin tasklist / Skin elastic (Assets) +Group: Applications/Internet +Provides: roundcubemail(plugin-tasklist-skin-elastic-assets) = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n roundcubemail-plugin-tasklist-skin-elastic-assets +Plugin tasklist / Skin elastic (Assets Package) + %package -n roundcubemail-plugin-tasklist-skin-larry-assets Summary: Plugin tasklist / Skin larry (Assets) Group: Applications/Internet @@ -848,19 +1203,25 @@ Plugin tasklist / Skin larry (Assets Package) %prep -%setup -q -c "%{name}-%{version}" +%setup -q -c "%{name}-%{version}%{?dash_rel_suffix}" -pushd %{name}-%{version} +pushd %{name}-%{version}%{?dash_rel_suffix} + +ls -l +mkdir -p skins/elastic/ +rm -rvf skins/elastic/images +mkdir -p skins/elastic/images/ +cp -av %{datadir}/skins/elastic/images/* skins/elastic/images/. +cp -av %{datadir}/skins/elastic/styles/ skins/elastic/. %if 0%{?plesk} # Provide defaults for Plesk -cp -af %{SOURCE100} plugins/calendar/config.inc.php.dist -cp -af %{SOURCE101} plugins/kolab_addressbook/config.inc.php.dist -cp -af %{SOURCE102} plugins/kolab_folders/config.inc.php.dist -cp -af %{SOURCE103} plugins/libkolab/config.inc.php.dist +cp -afv %{SOURCE100} plugins/calendar/config.inc.php.dist +cp -afv %{SOURCE101} plugins/kolab_addressbook/config.inc.php.dist +cp -afv %{SOURCE102} plugins/kolab_folders/config.inc.php.dist +cp -afv %{SOURCE103} plugins/libkolab/config.inc.php.dist %endif -%patch0001 -p1 %patch1001 -p1 find -type d -name "helpdocs" -exec rm -rvf {} \; 2>/dev/null || : @@ -868,11 +1229,20 @@ rm -rf plugins/kolab_zpush rm -rf plugins/owncloud -# Remove the results of patching when there's an incidental offset -find . -type f -name "*.orig" -delete +# Remove hidden files and directories +find . -type f -name ".*" -delete | while read file; do + rm -rvf ${file} +done + +find . -type d -name ".*" ! -name "." ! -name ".." | while read dir; do + rm -rvf ${dir} +done -# Remove hidden files -find . -type f -name ".*" -delete +while [ ! -z "$(find . -type d -empty)" ]; do + find . -type d -empty | while read dir; do + rm -rvf ${dir} + done +done # Eliminate links for link in `find . -type l`; do @@ -883,8 +1253,8 @@ popd -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") +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} @@ -895,11 +1265,39 @@ echo "Requires: roundcubemail(core) >= %%{roundcube_version}" echo "Requires: roundcubemail(plugin-$(basename ${plugin})-assets) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}" if [ -d "${plugin}/skins/" ]; then - echo "Requires: roundcubemail(plugin-$(basename ${plugin})-skin) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}" + echo "%%if 0%%{?plesk}" + if [ -d "${target_dir}/skins/elastic/" ]; then + echo "Requires: roundcubemail(plugin-$(basename ${plugin})-skin-elastic) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}" + else + echo "Obsoletes: roundcubemail-plugin-$(basename ${plugin})-skin-elastic < %%{?epoch:%%{epoch}:}%%{version}-%%{release}" + echo "Obsoletes: roundcubemail-plugin-$(basename ${plugin})-skin-elastic-assets < %%{?epoch:%%{epoch}:}%%{version}-%%{release}" + fi + echo "Requires: roundcubemail(skin-plesk) >= 0.4" + echo "%%else" + echo "%%if 0%%{?kolab_enterprise}" + echo "%%if 0%%{?bootstrap} < 1" + echo "Requires: roundcubemail(skin-enterprise) >= 0.3.7" + echo "Requires: roundcubemail(skin-kolab) >= 0.4" + echo "%%endif" + if [ ! -d "${target_dir}/skins/elastic/" ]; then + echo "Obsoletes: roundcubemail-plugin-$(basename ${plugin})-skin-elastic < %%{?epoch:%%{epoch}:}%%{version}-%%{release}" + echo "Obsoletes: roundcubemail-plugin-$(basename ${plugin})-skin-elastic-assets < %%{?epoch:%%{epoch}:}%%{version}-%%{release}" + fi + echo "%%else" + echo "Requires: roundcubemail(skin-chameleon) >= 0.3.9" + echo "Requires: roundcubemail(plugin-$(basename ${plugin})-skin-elastic) >= 1.4" + echo "Requires: roundcubemail(plugin-$(basename ${plugin})-skin-larry) >= 1.4" + echo "%%endif" + echo "%%endif" + else + echo "Obsoletes: roundcubemail-plugin-$(basename ${plugin})-skin-elastic < 1.4.0" + echo "Obsoletes: roundcubemail-plugin-$(basename ${plugin})-skin-elastic-assets < 1.4.0" + echo "Obsoletes: roundcubemail-plugin-$(basename ${plugin})-skin-larry < 1.4.0" + echo "Obsoletes: roundcubemail-plugin-$(basename ${plugin})-skin-larry-assets < 1.4.0" fi for rplugin in $(grep -rn "require_plugin" ${plugin}/ | cut -d"'" -f2 | sort); do - if [ -d "%{name}-%{version}/plugins/${rplugin}" ]; then + if [ -d "%{name}-%{version}%{?dash_rel_suffix}/plugins/${rplugin}" ]; then echo "Requires: roundcubemail(plugin-${rplugin}) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}" else echo "Requires: roundcubemail(plugin-${rplugin}) >= %%{roundcube_version}" @@ -926,9 +1324,6 @@ ( echo "%files -n roundcubemail-plugin-$(basename ${plugin}) -f plugin-$(basename ${plugin}).files" echo "%defattr(-,root,root,-)" - if [ -d "${plugin}/config" -o -f "${plugin}/config.inc.php" -o -f "${plugin}/config.inc.php.dist" ]; then - echo "%attr(0640,root,%%{httpd_group}) %config(noreplace) %%{_sysconfdir}/roundcubemail/$(basename ${plugin}).inc.php" - fi echo "" ) >> plugins.files @@ -992,9 +1387,9 @@ echo "" ) >> plugins-assets.files - for skin in larry classic; do + for skin in elastic larry; do for dir in $(find ${target_dir} -type d -name "${skin}" | grep -v "helpdocs" | sort); do - starget_dir=$(echo ${dir} | %{__sed} -e "s|%{name}-plugin-$(basename ${plugin})-%{version}|%{name}-plugin-$(basename ${plugin})-skin-${skin}-%{version}|g") + 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} @@ -1057,11 +1452,19 @@ %build +pushd %{name}-%{version}%{?dash_rel_suffix} + +# Compile and compress the CSS +for file in `find . -type f -name "styles.less" -o -name "print.less" -o -name "embed.less" -o -name "libkolab.less"`; do + %{_bindir}/lessc --relative-urls ${file} > $(dirname ${file})/$(basename ${file} .less).css +done + %install %{__install} -pm 755 %{SOURCE1} . function new_files() { - find %{buildroot}%{datadir} -type d -exec echo "%dir {}" \; > current-new.files + find %{buildroot}%{confdir} -type f -exec echo "%attr(0640,root,%%{httpd_group}) %config(noreplace) {}" \; > current-new.files + find %{buildroot}%{datadir} -type d -exec echo "%dir {}" \; >> current-new.files find %{buildroot}%{datadir} -type f >> current-new.files find %{buildroot}%{datadir} -type l >> current-new.files @@ -1093,34 +1496,32 @@ echo "Dividing Plugins, Plugin Assets, Plugin Skins and Plugin Skin Assets and Non-Assets" echo "=================================================================" -for plugin in $(find %{name}-%{version}/plugins/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | sort); do - for skin in larry classic; do - orig_dir="%{name}-plugin-${plugin}-skin-${skin}-%{version}" - asset_dir="%{name}-plugin-${plugin}-skin-${skin}-assets-%{version}" +for plugin in $(find %{name}-%{version}%{?dash_rel_suffix}/plugins/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | sort); do + for skin in elastic larry; do + orig_dir="%{name}-plugin-${plugin}-skin-${skin}-%{version}%{?dash_rel_suffix}" + asset_dir="%{name}-plugin-${plugin}-skin-${skin}-assets-%{version}%{?dash_rel_suffix}" # Compress the CSS for file in `find ${orig_dir} -type f -name "*.css"`; do asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g")) %{__mkdir_p} ${asset_loc} - cat ${file} | %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) && \ - %{__rm} -rf ${file} || \ - %{__mv} -v ${file} ${asset_loc}/$(basename ${file}) + cat ${file} | %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) || \ + %{__cp} -av ${file} ${asset_loc}/$(basename ${file}) done || : # Compress the JS, but not the already minified for file in `find ${orig_dir} -type f -name "*.js" ! -name "*.min.js"`; do asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g")) %{__mkdir_p} ${asset_loc} - uglifyjs ${file} > ${asset_loc}/$(basename ${file}) && \ - %{__rm} -rf ${file} || \ - %{__mv} -v ${file} ${asset_loc}/$(basename ${file}) + uglifyjs ${file} > ${asset_loc}/$(basename ${file}) || \ + %{__cp} -av ${file} ${asset_loc}/$(basename ${file}) done || : # The already minified JS can just be copied over to the assets location for file in `find ${orig_dir} -type f -name "*.min.js"`; do asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g")) %{__mkdir_p} ${asset_loc} - %{__mv} -v ${file} ${asset_loc}/$(basename ${file}) + %{__cp} -av ${file} ${asset_loc}/$(basename ${file}) done || : # Other assets @@ -1135,11 +1536,12 @@ -name "*.swf" -o \ -name "*.tif" -o \ -name "*.ttf" -o \ - -name "*.woff" + -name "*.woff" -o \ + -name "*.woff2" ); do asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g")) %{__mkdir_p} ${asset_loc} - %{__mv} -vf ${file} ${asset_loc}/$(basename $file) + %{__cp} -av ${file} ${asset_loc}/$(basename $file) done || : # Purge empty directories @@ -1147,32 +1549,30 @@ done # Skin-independent assets - orig_dir="%{name}-plugin-${plugin}-%{version}" - asset_dir="%{name}-plugin-${plugin}-assets-%{version}" + orig_dir="%{name}-plugin-${plugin}-%{version}%{?dash_rel_suffix}" + asset_dir="%{name}-plugin-${plugin}-assets-%{version}%{?dash_rel_suffix}" # Compress the CSS for file in `find ${orig_dir} -type f -name "*.css"`; do asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g")) %{__mkdir_p} ${asset_loc} - cat ${file} | %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) && \ - %{__rm} -rf ${file} || \ - %{__mv} -v ${file} ${asset_loc}/$(basename ${file}) + cat ${file} | %{_bindir}/python-cssmin > ${asset_loc}/$(basename ${file}) || \ + %{__cp} -av ${file} ${asset_loc}/$(basename ${file}) done # Compress the JS, but not the already minified for file in `find ${orig_dir} -type f -name "*.js" ! -name "*.min.js"`; do asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g")) %{__mkdir_p} ${asset_loc} - uglifyjs ${file} > ${asset_loc}/$(basename ${file}) && \ - %{__rm} -rf ${file} || \ - %{__mv} -v ${file} ${asset_loc}/$(basename ${file}) + uglifyjs ${file} > ${asset_loc}/$(basename ${file}) || \ + %{__cp} -av ${file} ${asset_loc}/$(basename ${file}) done # The already minified JS can just be copied over to the assets location for file in `find ${orig_dir} -type f -name "*.min.js"`; do asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g")) %{__mkdir_p} ${asset_loc} - %{__mv} -v ${file} ${asset_loc}/$(basename ${file}) + %{__cp} -av ${file} ${asset_loc}/$(basename ${file}) done # Other assets @@ -1187,40 +1587,41 @@ -name "*.swf" -o \ -name "*.tif" -o \ -name "*.ttf" -o \ - -name "*.woff" + -name "*.woff" -o \ + -name "*.woff2" ); do asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g")) %{__mkdir_p} ${asset_loc} - %{__mv} -vf ${file} ${asset_loc}/$(basename $file) + %{__cp} -av ${file} ${asset_loc}/$(basename $file) done if [ "${plugin}" == "pdfviewer" ]; then - %{__mv} -vf ${orig_dir}/plugins/pdfviewer/viewer/locale ${asset_dir}/plugins/pdfviewer/viewer/. - %{__mv} -vf ${orig_dir}/plugins/pdfviewer/viewer/viewer.html ${asset_dir}/plugins/pdfviewer/viewer/. + %{__cp} -av ${orig_dir}/plugins/pdfviewer/viewer/locale ${asset_dir}/plugins/pdfviewer/viewer/. + %{__cp} -av ${orig_dir}/plugins/pdfviewer/viewer/viewer.html ${asset_dir}/plugins/pdfviewer/viewer/. fi # Purge empty directories find ${orig_dir} -type d -empty -delete || : # Install the assets - for file in `find %{name}-plugin-${plugin}-assets-%{version} -type f`; do - asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|%{name}-plugin-${plugin}-assets-%{version}|${asset_path}|g")) + for file in `find %{name}-plugin-${plugin}-assets-%{version}%{?dash_rel_suffix} -type f`; do + asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|%{name}-plugin-${plugin}-assets-%{version}%{?dash_rel_suffix}|${asset_path}|g")) %{__mkdir_p} ${asset_loc} - %{__mv} -v ${file} ${asset_loc}/$(basename ${file}) + %{__cp} -av ${file} ${asset_loc}/$(basename ${file}) done || : new_files > plugin-${plugin}-assets.files - echo "== Files for plugin ${plugin}: ==" + echo "== Files for plugin-${plugin}-assets: ==" cat plugin-${plugin}-assets.files echo "===========================" %{__mkdir_p} %{buildroot}%{plugindir} - cp -a %{name}-plugin-${plugin}-%{version}/plugins/${plugin} %{buildroot}%{plugindir}/. + cp -av %{name}-plugin-${plugin}-%{version}%{?dash_rel_suffix}/plugins/${plugin} %{buildroot}%{plugindir}/. if [ -f "%{buildroot}%{plugindir}/${plugin}/config.inc.php.dist" ]; then pushd %{buildroot}%{plugindir}/${plugin} - %{__mv} config.inc.php.dist %{buildroot}%{confdir}/${plugin}.inc.php + %{__mv} -vf config.inc.php.dist %{buildroot}%{confdir}/${plugin}.inc.php ln -s ../../../../..%{confdir}/${plugin}.inc.php config.inc.php popd fi @@ -1235,40 +1636,41 @@ new_files > plugin-${plugin}.files - echo "== Files for plugin ${plugin}: ==" + echo "== Files for plugin-${plugin}: ==" cat plugin-${plugin}.files echo "===========================" done -for plugin in $(find %{name}-%{version}/plugins/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | sort); do - for skin in larry classic; do +for plugin in $(find %{name}-%{version}%{?dash_rel_suffix}/plugins/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | sort); do + for skin in elastic larry; do touch plugin-${plugin}-skin-${skin}.files touch plugin-${plugin}-skin-${skin}-assets.files + + if [ ! -d "%{name}-plugin-${plugin}-skin-${skin}-%{version}%{?dash_rel_suffix}/plugins/${plugin}/skins" ]; then + rm -vf plugin-${plugin}-skin-${skin}.files + rm -vf plugin-${plugin}-skin-${skin}-assets.files + continue + fi + + %{__install} -d %{buildroot}%{plugindir}/${plugin}/skins/ + cp -av %{name}-plugin-${plugin}-skin-${skin}-%{version}%{?dash_rel_suffix}/plugins/${plugin}/skins/${skin} %{buildroot}%{plugindir}/${plugin}/skins/. - if [ -d "%{name}-plugin-${plugin}-skin-${skin}-%{version}/plugins/${plugin}/skins/${skin}" ]; then - %{__install} -d %{buildroot}%{plugindir}/${plugin}/skins/ - cp -a %{name}-plugin-${plugin}-skin-${skin}-%{version}/plugins/${plugin}/skins/${skin} %{buildroot}%{plugindir}/${plugin}/skins/. - - new_files > plugin-${plugin}-skin-${skin}.files - - echo "== Files for skin ${plugin}-${skin}: ==" - cat plugin-${plugin}-skin-${skin}.files - echo "===========================" + new_files > plugin-${plugin}-skin-${skin}.files + if [ ! -s "plugin-${plugin}-skin-${skin}.files" ]; then + rm -f plugin-${plugin}-skin-${skin}.files fi # Install the assets - for file in `find %{name}-plugin-${plugin}-skin-${skin}-assets-%{version} -type f`; do - asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|%{name}-plugin-${plugin}-skin-${skin}-assets-%{version}|${asset_path}|g")) + for file in `find %{name}-plugin-${plugin}-skin-${skin}-assets-%{version}%{?dash_rel_suffix} -type f`; do + asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|%{name}-plugin-${plugin}-skin-${skin}-assets-%{version}%{?dash_rel_suffix}|${asset_path}|g")) %{__mkdir_p} ${asset_loc} %{__cp} -av ${file} ${asset_loc}/$(basename ${file}) - done || : + done new_files > plugin-${plugin}-skin-${skin}-assets.files - - echo "== Files for skin ${plugin}-${skin}: ==" - cat plugin-${plugin}-skin-${skin}-assets.files - echo "===========================" - + if [ ! -s "plugin-${plugin}-skin-${skin}-assets.files" ]; then + rm -f plugin-${plugin}-skin-${skin}-assets.files + fi done done @@ -1786,41 +2188,33 @@ %files -n roundcubemail-plugin-calendar -f plugin-calendar.files %defattr(-,root,root,-) -%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/calendar.inc.php %files -n roundcubemail-plugin-html_converter -f plugin-html_converter.files %defattr(-,root,root,-) %files -n roundcubemail-plugin-kolab_2fa -f plugin-kolab_2fa.files %defattr(-,root,root,-) -%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/kolab_2fa.inc.php %files -n roundcubemail-plugin-kolab_activesync -f plugin-kolab_activesync.files %defattr(-,root,root,-) -%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/kolab_activesync.inc.php %files -n roundcubemail-plugin-kolab_addressbook -f plugin-kolab_addressbook.files %defattr(-,root,root,-) -%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/kolab_addressbook.inc.php %files -n roundcubemail-plugin-kolab_auth -f plugin-kolab_auth.files %defattr(-,root,root,-) -%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/kolab_auth.inc.php %files -n roundcubemail-plugin-kolab_config -f plugin-kolab_config.files %defattr(-,root,root,-) %files -n roundcubemail-plugin-kolab_delegation -f plugin-kolab_delegation.files %defattr(-,root,root,-) -%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/kolab_delegation.inc.php %files -n roundcubemail-plugin-kolab_files -f plugin-kolab_files.files %defattr(-,root,root,-) -%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/kolab_files.inc.php %files -n roundcubemail-plugin-kolab_folders -f plugin-kolab_folders.files %defattr(-,root,root,-) -%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/kolab_folders.inc.php %files -n roundcubemail-plugin-kolab_notes -f plugin-kolab_notes.files %defattr(-,root,root,-) @@ -1833,21 +2227,18 @@ %files -n roundcubemail-plugin-ldap_authentication -f plugin-ldap_authentication.files %defattr(-,root,root,-) -%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/ldap_authentication.inc.php %files -n roundcubemail-plugin-libcalendaring -f plugin-libcalendaring.files %defattr(-,root,root,-) %files -n roundcubemail-plugin-libkolab -f plugin-libkolab.files %defattr(-,root,root,-) -%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/libkolab.inc.php %files -n roundcubemail-plugin-loginfail -f plugin-loginfail.files %defattr(-,root,root,-) %files -n roundcubemail-plugin-logon_page -f plugin-logon_page.files %defattr(-,root,root,-) -%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/logon_page.html %files -n roundcubemail-plugin-odfviewer -f plugin-odfviewer.files %defattr(-,root,root,-) @@ -1857,22 +2248,22 @@ %files -n roundcubemail-plugin-piwik_analytics -f plugin-piwik_analytics.files %defattr(-,root,root,-) -%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/piwik_analytics.inc.php %files -n roundcubemail-plugin-tasklist -f plugin-tasklist.files %defattr(-,root,root,-) -%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/tasklist.inc.php %files -n roundcubemail-plugin-tinymce_config -f plugin-tinymce_config.files %defattr(-,root,root,-) %files -n roundcubemail-plugin-wap_client -f plugin-wap_client.files %defattr(-,root,root,-) -%attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/wap_client.inc.php %files -n roundcubemail-plugin-calendar-assets -f plugin-calendar-assets.files %defattr(-,root,root,-) +%files -n roundcubemail-plugin-html_converter-assets -f plugin-html_converter-assets.files +%defattr(-,root,root,-) + %files -n roundcubemail-plugin-kolab_2fa-assets -f plugin-kolab_2fa-assets.files %defattr(-,root,root,-) @@ -1936,96 +2327,153 @@ %files -n roundcubemail-plugin-tinymce_config-assets -f plugin-tinymce_config-assets.files %defattr(-,root,root,-) +%files -n roundcubemail-plugin-wap_client-assets -f plugin-wap_client-assets.files +%defattr(-,root,root,-) + +%files -n roundcubemail-plugin-calendar-skin-elastic -f plugin-calendar-skin-elastic.files +%defattr(-,root,root,-) + %files -n roundcubemail-plugin-calendar-skin-larry -f plugin-calendar-skin-larry.files %defattr(-,root,root,-) -%files -n roundcubemail-plugin-calendar-skin-classic -f plugin-calendar-skin-classic.files +%files -n roundcubemail-plugin-kolab_2fa-skin-elastic -f plugin-kolab_2fa-skin-elastic.files %defattr(-,root,root,-) %files -n roundcubemail-plugin-kolab_2fa-skin-larry -f plugin-kolab_2fa-skin-larry.files %defattr(-,root,root,-) +%files -n roundcubemail-plugin-kolab_activesync-skin-elastic -f plugin-kolab_activesync-skin-elastic.files +%defattr(-,root,root,-) + %files -n roundcubemail-plugin-kolab_activesync-skin-larry -f plugin-kolab_activesync-skin-larry.files %defattr(-,root,root,-) -%files -n roundcubemail-plugin-kolab_activesync-skin-classic -f plugin-kolab_activesync-skin-classic.files +%files -n roundcubemail-plugin-kolab_addressbook-skin-elastic -f plugin-kolab_addressbook-skin-elastic.files %defattr(-,root,root,-) %files -n roundcubemail-plugin-kolab_addressbook-skin-larry -f plugin-kolab_addressbook-skin-larry.files %defattr(-,root,root,-) -%files -n roundcubemail-plugin-kolab_addressbook-skin-classic -f plugin-kolab_addressbook-skin-classic.files +%files -n roundcubemail-plugin-kolab_delegation-skin-elastic -f plugin-kolab_delegation-skin-elastic.files %defattr(-,root,root,-) %files -n roundcubemail-plugin-kolab_delegation-skin-larry -f plugin-kolab_delegation-skin-larry.files %defattr(-,root,root,-) -%files -n roundcubemail-plugin-kolab_delegation-skin-classic -f plugin-kolab_delegation-skin-classic.files +%files -n roundcubemail-plugin-kolab_files-skin-elastic -f plugin-kolab_files-skin-elastic.files %defattr(-,root,root,-) %files -n roundcubemail-plugin-kolab_files-skin-larry -f plugin-kolab_files-skin-larry.files %defattr(-,root,root,-) +%files -n roundcubemail-plugin-kolab_notes-skin-elastic -f plugin-kolab_notes-skin-elastic.files +%defattr(-,root,root,-) + %files -n roundcubemail-plugin-kolab_notes-skin-larry -f plugin-kolab_notes-skin-larry.files %defattr(-,root,root,-) +%files -n roundcubemail-plugin-kolab_tags-skin-elastic -f plugin-kolab_tags-skin-elastic.files +%defattr(-,root,root,-) + %files -n roundcubemail-plugin-kolab_tags-skin-larry -f plugin-kolab_tags-skin-larry.files %defattr(-,root,root,-) +%files -n roundcubemail-plugin-libcalendaring-skin-larry -f plugin-libcalendaring-skin-larry.files +%defattr(-,root,root,-) + +%files -n roundcubemail-plugin-libkolab-skin-elastic -f plugin-libkolab-skin-elastic.files +%defattr(-,root,root,-) + +%files -n roundcubemail-plugin-libkolab-skin-larry -f plugin-libkolab-skin-larry.files +%defattr(-,root,root,-) + +%files -n roundcubemail-plugin-tasklist-skin-elastic -f plugin-tasklist-skin-elastic.files +%defattr(-,root,root,-) + %files -n roundcubemail-plugin-tasklist-skin-larry -f plugin-tasklist-skin-larry.files %defattr(-,root,root,-) +%files -n roundcubemail-plugin-calendar-skin-elastic-assets -f plugin-calendar-skin-elastic-assets.files +%defattr(-,root,root,-) + %files -n roundcubemail-plugin-calendar-skin-larry-assets -f plugin-calendar-skin-larry-assets.files %defattr(-,root,root,-) -%files -n roundcubemail-plugin-calendar-skin-classic-assets -f plugin-calendar-skin-classic-assets.files +%files -n roundcubemail-plugin-kolab_2fa-skin-elastic-assets -f plugin-kolab_2fa-skin-elastic-assets.files %defattr(-,root,root,-) %files -n roundcubemail-plugin-kolab_2fa-skin-larry-assets -f plugin-kolab_2fa-skin-larry-assets.files %defattr(-,root,root,-) +%files -n roundcubemail-plugin-kolab_activesync-skin-elastic-assets -f plugin-kolab_activesync-skin-elastic-assets.files +%defattr(-,root,root,-) + %files -n roundcubemail-plugin-kolab_activesync-skin-larry-assets -f plugin-kolab_activesync-skin-larry-assets.files %defattr(-,root,root,-) -%files -n roundcubemail-plugin-kolab_activesync-skin-classic-assets -f plugin-kolab_activesync-skin-classic-assets.files +%files -n roundcubemail-plugin-kolab_addressbook-skin-elastic-assets -f plugin-kolab_addressbook-skin-elastic-assets.files %defattr(-,root,root,-) %files -n roundcubemail-plugin-kolab_addressbook-skin-larry-assets -f plugin-kolab_addressbook-skin-larry-assets.files %defattr(-,root,root,-) -%files -n roundcubemail-plugin-kolab_addressbook-skin-classic-assets -f plugin-kolab_addressbook-skin-classic-assets.files +%files -n roundcubemail-plugin-kolab_delegation-skin-elastic-assets -f plugin-kolab_delegation-skin-elastic-assets.files %defattr(-,root,root,-) %files -n roundcubemail-plugin-kolab_delegation-skin-larry-assets -f plugin-kolab_delegation-skin-larry-assets.files %defattr(-,root,root,-) -%files -n roundcubemail-plugin-kolab_delegation-skin-classic-assets -f plugin-kolab_delegation-skin-classic-assets.files +%files -n roundcubemail-plugin-kolab_files-skin-elastic-assets -f plugin-kolab_files-skin-elastic-assets.files %defattr(-,root,root,-) %files -n roundcubemail-plugin-kolab_files-skin-larry-assets -f plugin-kolab_files-skin-larry-assets.files %defattr(-,root,root,-) +%files -n roundcubemail-plugin-kolab_notes-skin-elastic-assets -f plugin-kolab_notes-skin-elastic-assets.files +%defattr(-,root,root,-) + %files -n roundcubemail-plugin-kolab_notes-skin-larry-assets -f plugin-kolab_notes-skin-larry-assets.files %defattr(-,root,root,-) +%files -n roundcubemail-plugin-kolab_tags-skin-elastic-assets -f plugin-kolab_tags-skin-elastic-assets.files +%defattr(-,root,root,-) + %files -n roundcubemail-plugin-kolab_tags-skin-larry-assets -f plugin-kolab_tags-skin-larry-assets.files %defattr(-,root,root,-) %files -n roundcubemail-plugin-libcalendaring-skin-larry-assets -f plugin-libcalendaring-skin-larry-assets.files %defattr(-,root,root,-) +%files -n roundcubemail-plugin-libkolab-skin-elastic-assets -f plugin-libkolab-skin-elastic-assets.files +%defattr(-,root,root,-) + %files -n roundcubemail-plugin-libkolab-skin-larry-assets -f plugin-libkolab-skin-larry-assets.files %defattr(-,root,root,-) +%files -n roundcubemail-plugin-tasklist-skin-elastic-assets -f plugin-tasklist-skin-elastic-assets.files +%defattr(-,root,root,-) + %files -n roundcubemail-plugin-tasklist-skin-larry-assets -f plugin-tasklist-skin-larry-assets.files %defattr(-,root,root,-) %changelog -* Thu May 17 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.3.6-2 -- Fix removal of first occurence of event when moving (T103344) +* Wed May 16 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-16.alpha4 +- Ship a pre-release version of the Elastic skin + +* Tue May 15 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-31.alpha4 +- Ship a pre-release version of the Elastic skin + +* Mon May 14 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-18.alpha4 +- Ship a pre-release version of the Elastic skin + +* Mon Apr 30 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-16.alpha2 +- Ship a pre-release version of the Elastic skin + +* Wed Apr 25 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-14.alpha1 +- Ship a pre-release version of the Elastic skin -* Tue Apr 17 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.3.6-1 -- Release of 3.3.6 +* Thu Apr 12 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-12.alpha0 +- Ship a pre-release version of the Elastic skin * Fri Jan 5 2018 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.3.5-2 - Repack of 3.3.5
View file
debian.changelog
Changed
@@ -1,14 +1,8 @@ -roundcubemail-plugins-kolab (1:3.3.6-0~kolab2) unstable; urgency=low +roundcubemail-plugins-kolab (1:3.4-0~kolab1) unstable; urgency=low - * Fix removing first occurrence of an event when moving (T103344) + * Release 3.4 pre-alpha - -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Thu, 17 May 2018 11:11:11 +0200 - -roundcubemail-plugins-kolab (1:3.3.6-0~kolab1) unstable; urgency=low - - * Release 3.3.6 - - -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Tue, 17 Apr 2018 11:11:11 +0200 + -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Tue, 10 Apr 2018 11:11:11 +0200 roundcubemail-plugins-kolab (1:3.3.5-0~kolab2) unstable; urgency=low
View file
debian.control
Changed
@@ -3,7 +3,7 @@ Priority: extra Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Uploaders: Paul Klos <kolab@klos2day.nl> -Build-Depends: cssmin, debhelper (>= 8), node-uglify, psa | bash +Build-Depends: cssmin, debhelper (>= 8), node-less, node-uglify, roundcubemail-core (>= 1.4), psa | bash Standards-Version: 3.9.3 Vcs-Git: git://git.kolabsys.com/git/apt/roundcube-plugins-kolab Vcs-Browser: http://git.kolabsys.com/apt/roundcube-plugins-kolab.git
View file
debian.rules
Changed
@@ -11,6 +11,15 @@ find plugins -type d -name helpdocs -exec rm -rvf {} \; 2>/dev/null || : find plugins -type d -name tests -exec rm -rvf {} \; 2>/dev/null || : + ls -l $(CURDIR) + mkdir -p $(CURDIR)/skins + cp -avf /usr/share/roundcubemail/skins/elastic/ $(CURDIR)/skins/. + + # Compile and compress the CSS + for file in `find $(CURDIR) -type f -name "styles.less" -o -name "print.less" -o -name "embed.less" -o -name "libkolab.less"`; do \ + lessc --relative-urls $${file} > $$(dirname $${file})/$$(basename $${file} .less).css ; \ + done + # Compress the CSS for file in `find $(CURDIR) -type f -name "*.css"`; do \ asset_loc=$$(dirname $$(echo $${file} | sed \ @@ -19,9 +28,7 @@ ) ; \ echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \ mkdir -p $${asset_loc} ; \ - cat $${file} | cssmin > $${asset_loc}/$$(basename $${file}) && \ - rm -rvf $${file} || \ - mv -vf $${file} $${asset_loc}/$$(basename $${file}) ; \ + cat $${file} | cssmin > $${asset_loc}/$$(basename $${file}) ; \ done # Compress the JS, but not the already minified @@ -32,9 +39,7 @@ ) ; \ echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \ mkdir -p $${asset_loc} ; \ - uglifyjs $${file} > $${asset_loc}/$$(basename $${file}) && \ - rm -rvf $${file} || \ - mv -vf $${file} $${asset_loc}/$$(basename $${file}) ; \ + uglifyjs $${file} > $${asset_loc}/$$(basename $${file}) ; \ done # The already minied JS can just be copied over to the assets location @@ -44,7 +49,7 @@ -e "s|$(CURDIR)/plugins/$${plugin}/skins/|$(CURDIR)/public_html/assets/plugins/$${plugin}/skins/|g") ; \ ) ; \ mkdir -p $${asset_loc} ; \ - mv -vf $${file} $${asset_loc}/$$(basename $${file}) ; \ + cp -avf $${file} $${asset_loc}/$$(basename $${file}) ; \ done # Other assets
View file
debian.series
Changed
@@ -1,2 +1,1 @@ roundcubemail-plugins-kolab-3.3-kolab-files-manticore-api.patch -p1 -0001-Fix-missing-first-occurrence-of-an-event-when-moved-.patch -p1
View file
roundcubemail-plugins-kolab.dsc
Changed
@@ -2,11 +2,11 @@ Source: roundcubemail-plugins-kolab Binary: roundcubemail-plugins-kolab Architecture: all -Version: 1:3.3.6-0~kolab2 +Version: 1:3.4-0~kolab1 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Uploaders: Paul Klos <kolab@klos2day.nl> Standards-Version: 3.9.3 -Build-Depends: cssmin, debhelper (>= 8), node-uglify, psa | bash +Build-Depends: cssmin, debhelper (>= 8), node-less, node-uglify, roundcubemail-core (>= 1.4), psa | bash Package-List: roundcubemail-plugins-kolab deb web extra roundcubemail-plugin-calendar deb web extra @@ -34,5 +34,5 @@ roundcubemail-plugin-tinymce-config deb web extra roundcubemail-plugin-wap-client deb web extra Files: - 00000000000000000000000000000000 0 roundcubemail-plugins-kolab-3.3.6.tar.gz + 00000000000000000000000000000000 0 roundcubemail-plugins-kolab-3.4-alpha0.tar.gz 00000000000000000000000000000000 0 debian.tar.gz
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.