Kolab Groupware OBS

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.

Changes of Revision 23

roundcubemail-plugins-kolab.spec Changed

@@ -1,3 +1,10 @@
+%if 0%{?opensuse_bs}
+#!BuildIgnore: lighttpd
+#!BuildIgnore: nginx
+%endif
+
+%global bootstrap 0
+
 %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
 
 %if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
@@ -28,9 +35,16 @@
 %global confdir %{_sysconfdir}/roundcubemail
 %global tmpdir %{_var}/lib/roundcubemail
 
+%global rc_version 3.4
+%global rc_rel_suffix alpha8
+%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:        39%{?dot_rel_suffix}%{?dist}
+
 Summary:        Kolab Groupware plugins for Roundcube Webmail
 
 Group:          Applications/Internet
@@ -38,15 +52,14 @@
 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
 Source101:      plesk.kolab_addressbook.inc.php
-Source102:      plesk.kolab_folders.inc.php
-Source103:      plesk.libkolab.inc.php
-
-Patch0001:      0001-Fix-missing-first-occurrence-of-an-event-when-moved-.patch
+Source102:      plesk.kolab_chat.inc.php
+Source103:      plesk.kolab_folders.inc.php
+Source104:      plesk.libkolab.inc.php
 
 Patch1001:      roundcubemail-plugins-kolab-3.3-kolab-files-manticore-api.patch
 
@@ -61,20 +74,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 +119,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 +147,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 +162,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 +190,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 +217,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,16 +243,49 @@
 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
 Plugin kolab_auth

0001-Fix-missing-first-occurrence-of-an-event-when-moved-.patch Deleted

@@ -1,66 +0,0 @@
-From b5991f4251c9be9b12230887427571b110101e42 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <machniak@kolabsys.com>
-Date: Mon, 14 May 2018 08:56:08 +0200
-Subject: PATCH Fix missing first occurrence of an event when moved to
- another day (Bifrost#T103344)
-
----
- plugins/calendar/drivers/kolab/kolab_calendar.php | 21 ++++++++++++++++-----
- 1 file changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
-index d6500ab9..a7bab9d6 100644
---- a/plugins/calendar/drivers/kolab/kolab_calendar.php
-+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
-@@ -317,7 +317,6 @@ class kolab_calendar extends kolab_storage_folder_api
-       if ($event'start' <= $end && $event'end' >= $start) {
-         unset($event'_attendees');
-         $add = true;
--
-         // skip the first instance of a recurring event if listed in exdate
-         if ($virtual && !empty($event'recurrence''EXDATE')) {
-           $event_date = $event'start'->format('Ymd');
-@@ -594,10 +593,11 @@ class kolab_calendar extends kolab_storage_folder_api
-   /**
-    * Create instances of a recurring event
-    *
--   * @param array  Hash array with event properties
--   * @param object DateTime Start date of the recurrence window
--   * @param object DateTime End date of the recurrence window
--   * @param string ID of a specific recurring event instance
-+   * @param array    $event    Hash array with event properties
-+   * @param DateTime $start    Start date of the recurrence window
-+   * @param DateTime $end      End date of the recurrence window
-+   * @param string   $event_id ID of a specific recurring event instance
-+   *
-    * @return array List of recurring event instances
-    */
-   public function get_recurring_events($event, $start, $end = null, $event_id = null)
-@@ -607,6 +607,7 @@ class kolab_calendar extends kolab_storage_folder_api
-       $rec = $this->storage->get_object($event'id');
-       $object = $rec'_formatobj';
-     }
-+
-     if (!is_object($object))
-       return array();
- 
-@@ -658,6 +659,16 @@ class kolab_calendar extends kolab_storage_folder_api
-       return array($this->events$event_id);
-     }
- 
-+    // Check first occurrence, it might have been moved
-+    if ($first = $exdata$event'start'->format('Ymd')) {
-+      // return it only if not already in the result, but in the requested period
-+      if (!($event'start' <= $end && $event'end' >= $start)
-+        && ($first'start' <= $end && $first'end' >= $start)
-+      ) {
-+          $events = $first;
-+      }
-+    }
-+
-     // use libkolab to compute recurring events
-     $recurrence = new kolab_date_recurrence($object);
- 
--- 
-2.14.3
-

debian.changelog Changed

@@ -1,14 +1,40 @@
-roundcubemail-plugins-kolab (1:3.3.6-0~kolab2) unstable; urgency=low
+roundcubemail-plugins-kolab (1:3.4-0~kolab39) unstable; urgency=low
 
-  * Fix removing first occurrence of an event when moving (T103344)
+  * New snapshot
+  * Fix per user logging
 
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 17 May 2018 11:11:11 +0200
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sat, 18 Aug 2018 11:11:11 +0200
 
-roundcubemail-plugins-kolab (1:3.3.6-0~kolab1) unstable; urgency=low
+roundcubemail-plugins-kolab (1:3.4-0~kolab38) unstable; urgency=low
 
-  * Release 3.3.6
+  * Rebuild against core elastic update
+  * Ship a preliminary chat integration plugin
 
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 17 Apr 2018 11:11:11 +0200
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 12 Jul 2018 11:11:11 +0200
+
+roundcubemail-plugins-kolab (1:3.4-0~kolab4) unstable; urgency=low
+
+  * Rebuild against core elastic update
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue,  5 Jun 2018 11:11:11 +0200
+
+roundcubemail-plugins-kolab (1:3.4-0~kolab3) unstable; urgency=low
+
+  * Release 3.4 pre-alpha
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 29 May 2018 11:11:11 +0200
+
+roundcubemail-plugins-kolab (1:3.4-0~kolab2) unstable; urgency=low
+
+  * Release 3.4 pre-alpha
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 22 May 2018 11:11:11 +0200
+
+roundcubemail-plugins-kolab (1:3.4-0~kolab1) unstable; urgency=low
+
+  * Release 3.4 pre-alpha
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 10 Apr 2018 11:11:11 +0200
 
 roundcubemail-plugins-kolab (1:3.3.5-0~kolab2) unstable; urgency=low

debian.control Changed

debian.rules Changed

@@ -11,6 +11,20 @@
 	find plugins -type d -name helpdocs -exec rm -rvf {} \; 2>/dev/null || :
 	find plugins -type d -name tests -exec rm -rvf {} \; 2>/dev/null || :
 
+	ls -l $(CURDIR)
+	mkdir -p $(CURDIR)/skins
+	cp -avf /usr/share/roundcubemail/skins/elastic/ $(CURDIR)/skins/.
+
+        # Compile the CSS
+	for file in `find $(CURDIR) -type f -name "styles.less" -o -name "print.less" -o -name "embed.less" -o -name "libkolab.less"`; do \
+		lessc --relative-urls $${file} > $$(dirname $${file})/$$(basename $${file} .less).css ; \
+		sed -i \
+			-e "s|../../../skins/elastic/images/contactpic.png|../../../../skins/elastic/images/contactpic.png|" \
+			-e "s|../../../skins/elastic/images/watermark.jpg|../../../../skins/elastic/images/watermark.jpg|" \
+			$$(dirname $${file})/$$(basename $${file} .less).css ; \
+	done
+
+
 	# Compress the CSS
 	for file in `find $(CURDIR) -type f -name "*.css"`; do \
 		asset_loc=$$(dirname $$(echo $${file} | sed \
@@ -19,9 +33,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 +44,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 +54,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
@@ -89,6 +99,7 @@
 	if  -f "/etc/plesk-release" ; then \
 		cp -v ../SOURCES/plesk.calendar.inc.php config/calendar.inc.php ; \
 		cp -v ../SOURCES/plesk.kolab_addressbook.inc.php config/kolab_addressbook.inc.php ; \
+		cp -v ../SOURCES/plesk.kolab_chat.inc.php config/kolab_chat.inc.php ; \
 		cp -v ../SOURCES/plesk.kolab_folders.inc.php config/kolab_folders.inc.php ; \
 		cp -v ../SOURCES/plesk.libkolab.inc.php config/libkolab.inc.php ; \
 	fi

debian.series Changed

plesk.kolab_chat.inc.php Added

roundcubemail-plugins-kolab-3.3.6.tar.gz Deleted

roundcubemail-plugins-kolab-3.4-alpha8.tar.gz Added

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~kolab39
 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
@@ -15,6 +15,7 @@
  roundcubemail-plugin-kolab-activesync deb web extra
  roundcubemail-plugin-kolab-addressbook deb web extra
  roundcubemail-plugin-kolab-auth deb web extra
+ roundcubemail-plugin-kolab-chat deb web extra
  roundcubemail-plugin-kolab-config deb web extra
  roundcubemail-plugin-kolab-delegation deb web extra
  roundcubemail-plugin-kolab-files deb web extra
@@ -34,5 +35,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-alpha8.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz