Request 2413 (accepted)

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

Request 2413 (accepted)

Check in 3.4.2

Created by vanmeeuwen almost 6 years ago
In state accepted

Submit roundcubemail-plugins-kolab

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

roundcubemail-plugins-kolab.spec Changed

@@ -41,9 +41,9 @@
 %global dash_rel_suffix %{?rc_rel_suffix:-%{rc_rel_suffix}}
 
 Name:           roundcubemail-plugins-kolab
-Version:        3.4.1
+Version:        3.4.2
 
-Release:        2%{?dot_rel_suffix}%{?dist}
+Release:        1%{?dot_rel_suffix}%{?dist}
 
 Summary:        Kolab Groupware plugins for Roundcube Webmail
 
@@ -62,7 +62,6 @@
 Source104:      plesk.libkolab.inc.php
 
 Patch1001:      roundcubemail-plugins-kolab-3.3-kolab-files-manticore-api.patch
-Patch1002:      roundcubemail-plugins-kolab-3.4.1-activesync-setup-url.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
@@ -1362,7 +1361,6 @@
 %endif
 
 %patch1001 -p1
-%patch1002 -p1
 
 find -type d -name "helpdocs" -exec rm -rvf {} \; 2>/dev/null || :
 
@@ -2667,8 +2665,8 @@
 %defattr(-,root,root,-)
 
 %changelog
-* Sat Jan 19 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.1-2
-- Adjust the ActiveSync device setup URL
+* Sat Jan 19 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.2-1
+- Release of version 3.4.2
 
 * Thu Dec  6 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.1-1
 - Release of version 3.4.1

roundcubemail-plugins-kolab-3.4.1-activesync-setup-url.patch Deleted

@@ -1,29 +0,0 @@
-commit 1eaea682cc5d3cf287d6ac5fd2951b1f3dd71f6a
-Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
-Date:   Sat Jan 19 08:44:49 2019 +0100
-
-    Adjust the ActiveSync device setup URL to https://kb.kolabenterprise.com/documentation/setting-up-an-activesync-client
-
-diff --git a/plugins/kolab_activesync/config.inc.php.dist b/plugins/kolab_activesync/config.inc.php.dist
-index adcc3787..7cab16ca 100644
---- a/plugins/kolab_activesync/config.inc.php.dist
-+++ b/plugins/kolab_activesync/config.inc.php.dist
-@@ -1,4 +1,4 @@
- <?php
- 
- // The page with Activesync clients configuration manual
--$config['activesync_setup_url'] = 'http://docs.kolab.org/client-configuration/';
-+$config['activesync_setup_url'] = 'https://kb.kolabenterprise.com/documentation/setting-up-an-activesync-client';
-diff --git a/plugins/kolab_activesync/kolab_activesync_ui.php b/plugins/kolab_activesync/kolab_activesync_ui.php
-index acd66506..705c9ae9 100644
---- a/plugins/kolab_activesync/kolab_activesync_ui.php
-+++ b/plugins/kolab_activesync/kolab_activesync_ui.php
-@@ -29,7 +29,7 @@ class kolab_activesync_ui
-     private $plugin;
-     public  $device = array();
- 
--    const SETUP_URL = 'http://docs.kolab.org/client-configuration';
-+    const SETUP_URL = 'https://kb.kolabenterprise.com/documentation/setting-up-an-activesync-client';
- 
- 
-     public function __construct($plugin)

debian.changelog Changed

debian.series Changed

roundcubemail-plugins-kolab-3.4.1.tar.gz -> roundcubemail-plugins-kolab-3.4.2.tar.gz Changed

roundcubemail-plugins-kolab.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2413 0

Request History

vanmeeuwen created request almost 6 years ago

Check in 3.4.2

vanmeeuwen accepted review almost 6 years ago

vanmeeuwen approved review almost 6 years ago

vanmeeuwen accepted request almost 6 years ago