Request 2379 (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 2379 (accepted)

Check in beta136

Created by vanmeeuwen about 6 years ago
In state accepted

Submit roundcubemail

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

roundcubemail.spec Changed

@@ -49,14 +49,14 @@
 %global tmpdir /var/lib/roundcubemail
 
 %global rc_version 1.4
-%global rc_rel_suffix beta95
+%global rc_rel_suffix beta136
 %global dot_rel_suffix %{?rc_rel_suffix:.%{rc_rel_suffix}}
 %global dash_rel_suffix %{?rc_rel_suffix:-%{rc_rel_suffix}}
 
 Name:           roundcubemail
 Version:        1.4
 
-Release:        65%{?dot_rel_suffix}%{?dist}
+Release:        66%{?dot_rel_suffix}%{?dist}
 
 Summary:        Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -618,10 +618,29 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-markasjunk-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?plesk}
+%if 0%{?bootstrap} < 1
+Obsoletes:      %{name}-plugin-markasjunk-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-plugin-markasjunk-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-plesk) >= 0.4
+Requires:       %{name}(skin-plesk-larry) >= 0.3
+Requires:       %{name}(plugin-markasjunk-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%else
+%if 0%{?kolab_enterprise}
+%if 0%{?bootstrap} < 1
+Requires:       %{name}(skin-enterprise) >= 0.3.7
+Requires:       %{name}(plugin-markasjunk-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-kolab) >= 0.4
+%endif
 Obsoletes:      %{name}-plugin-markasjunk-skin-elastic < %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes:      %{name}-plugin-markasjunk-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-markasjunk-skin-larry < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-plugin-markasjunk-skin-larry-assets < %{?epoch:%{epoch}:}%{version}-%{release}
+%else
+Requires:       %{name}(skin-chameleon) >= 0.3.9
+Requires:       %{name}(plugin-markasjunk-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-markasjunk-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%endif
 Provides:       %{name}(plugin-markasjunk) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-markasjunk
@@ -838,6 +857,7 @@
 Obsoletes:      %{name}-plugin-zipdownload-skin-elastic-assets < %{?epoch:%{epoch}:}%{version}-%{release}
 %else
 Requires:       %{name}(skin-chameleon) >= 0.3.9
+Requires:       %{name}(plugin-zipdownload-skin-elastic) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-zipdownload-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 %endif
@@ -1242,6 +1262,18 @@
 %description plugin-managesieve-skin-larry
 Plugin managesieve / Skin larry
 
+%package plugin-markasjunk-skin-larry
+Summary:        Plugin markasjunk / Skin larry
+Group:          Applications/Internet
+Requires:       %{name}(plugin-markasjunk) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(plugin-markasjunk-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-markasjunk-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-markasjunk-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-markasjunk-skin-larry
+Plugin markasjunk / Skin larry
+
 %package plugin-vcard_attachments-skin-larry
 Summary:        Plugin vcard_attachments / Skin larry
 Group:          Applications/Internet
@@ -1376,6 +1408,16 @@
 %description plugin-managesieve-skin-larry-assets
 Plugin managesieve / Skin larry (Assets Package)
 
+%package plugin-markasjunk-skin-larry-assets
+Summary:        Plugin markasjunk / Skin larry (Assets)
+Group:          Applications/Internet
+Requires:       %{name}(plugin-markasjunk-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}(skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-markasjunk-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-markasjunk-skin-larry-assets
+Plugin markasjunk / Skin larry (Assets Package)
+
 %package plugin-vcard_attachments-skin-larry-assets
 Summary:        Plugin vcard_attachments / Skin larry (Assets)
 Group:          Applications/Internet
@@ -3111,6 +3153,7 @@
 
 %files plugin-markasjunk -f plugin-markasjunk.files
 %defattr(-,root,root,-)
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{_sysconfdir}/%{name}/markasjunk.inc.php
 
 %files plugin-new_user_dialog -f plugin-new_user_dialog.files
 %defattr(-,root,root,-)
@@ -3289,6 +3332,9 @@
 %files plugin-managesieve-skin-larry -f plugin-managesieve-skin-larry.files
 %defattr(-,root,root,-)
 
+%files plugin-markasjunk-skin-larry -f plugin-markasjunk-skin-larry.files
+%defattr(-,root,root,-)
+
 %files plugin-vcard_attachments-skin-larry -f plugin-vcard_attachments-skin-larry.files
 %defattr(-,root,root,-)
 
@@ -3328,6 +3374,9 @@
 %files plugin-managesieve-skin-larry-assets -f plugin-managesieve-skin-larry-assets.files
 %defattr(-,root,root,-)
 
+%files plugin-markasjunk-skin-larry-assets -f plugin-markasjunk-skin-larry-assets.files
+%defattr(-,root,root,-)
+
 %files plugin-vcard_attachments-skin-larry-assets -f plugin-vcard_attachments-skin-larry-assets.files
 %defattr(-,root,root,-)
 
@@ -3347,6 +3396,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Nov 22 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-66.beta136
+- Check in 136 revisions ahead of the beta release
+
 * Mon Oct 29 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-50.beta95
 - Check in 95 revisions ahead of the beta release

default-configuration.patch Changed

@@ -1,16 +1,7 @@
-diff -ur roundcubemail-1.3.0.orig/config/defaults.inc.php roundcubemail-1.3.0/config/defaults.inc.php
---- roundcubemail-1.3.0.orig/config/defaults.inc.php	2017-06-26 20:51:51.000000000 +0200
-+++ roundcubemail-1.3.0/config/defaults.inc.php	2017-07-01 11:36:21.094364159 +0200
-@@ -514,7 +514,7 @@
- // If your authentication backend supports it, use "UTF-8".
- // Otherwise, use the appropriate character set.
- // Defaults to ISO-8859-1 for backward compatibility.
--$config['password_charset'] = 'ISO-8859-1';
-+$config['password_charset'] = 'UTF-8';
- 
- // How many seconds must pass between emails sent by a user
- $config['sendmail_delay'] = 0;
-@@ -630,7 +630,7 @@
+diff -ur roundcubemail-1.4-beta136.orig/config/defaults.inc.php roundcubemail-1.4-beta136/config/defaults.inc.php
+--- roundcubemail-1.4-beta136.orig/config/defaults.inc.php	2018-11-22 13:44:49.000000000 +0100
++++ roundcubemail-1.4-beta136/config/defaults.inc.php	2018-11-22 13:55:51.873258023 +0100
+@@ -656,7 +656,7 @@
  //    RewriteRule ^/roundcubemail/[a-zA-Z0-9]{16}/(.*) /roundcubemail/$1 [PT]
  //    Alias /roundcubemail /var/www/roundcubemail/
  // Note: Use assets_path to not prevent the browser from caching assets
@@ -19,7 +10,7 @@
  
  // Allows to define separate server/path for image/js/css files
  // Warning: If the domain is different cross-domain access to some
-@@ -639,11 +639,11 @@
+@@ -665,11 +665,11 @@
  //    <FilesMatch ".(eot|ttf|woff)">
  //    Header set Access-Control-Allow-Origin "*"
  //    </FilesMatch>
@@ -33,7 +24,7 @@
  
  
  // ----------------------------------
-@@ -737,7 +737,7 @@
+@@ -763,7 +763,7 @@
  // Since Google shut down their public spell checking service, the default settings
  // connect to http://spell.roundcube.net which is a hosted service provided by Roundcube.
  // You can connect to any other googie-compliant service by setting 'spellcheck_uri' accordingly.
@@ -42,7 +33,7 @@
  
  // For locally installed Nox Spell Server or After the Deadline services,
  // please specify the URI to call it.
-@@ -1138,7 +1138,7 @@
+@@ -1164,7 +1164,7 @@
  $config['display_next'] = true;
  
  // Default messages listing mode. One of 'threads' or 'list'.
@@ -51,4 +42,4 @@
  
  // 0 - Do not expand threads
  // 1 - Expand all threads automatically
-Only in roundcubemail-1.3.0/config: defaults.inc.php.orig
+Only in roundcubemail-1.4-beta136/config: defaults.inc.php.orig

debian.changelog Changed

roundcubemail-1.4-beta95.tar.gz -> roundcubemail-1.4-beta136.tar.gz Changed

roundcubemail.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2379 0

Request History

vanmeeuwen created request about 6 years ago

Check in beta136

vanmeeuwen accepted review about 6 years ago

vanmeeuwen approved review about 6 years ago

vanmeeuwen accepted request about 6 years ago