Projects
Kolab:Winterfell
roundcubemail-plugins-kolab
Log In
Username
Password
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
.
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
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
.