diff options
| -rw-r--r-- | composer.json | 3 | ||||
| -rw-r--r-- | plugins/jqueryui/composer.json | 2 | ||||
| -rw-r--r-- | roundcubemail.spec | 24 |
3 files changed, 16 insertions, 13 deletions
diff --git a/composer.json b/composer.json index 89a57a0..85a5491 100644 --- a/composer.json +++ b/composer.json @@ -21,8 +21,7 @@ "masterminds/html5": "~2.7.0", "bacon/bacon-qr-code": "^2.0.0", "guzzlehttp/guzzle": "^7.3.0", - "kolab/net_ldap3": "~1.1.1", - "symfony/deprecation-contracts": "2.2" + "kolab/net_ldap3": "~1.1.1" }, "require-dev": { "phpunit/phpunit": "^9" diff --git a/plugins/jqueryui/composer.json b/plugins/jqueryui/composer.json index 0b7e515..10cf660 100644 --- a/plugins/jqueryui/composer.json +++ b/plugins/jqueryui/composer.json @@ -3,7 +3,7 @@ "type": "roundcube-plugin", "description": "Plugin adds the complete jQuery-UI library including the smoothness theme to Roundcube. This allows other plugins to use jQuery-UI without having to load their own version. The benefit of using one central jQuery-UI is that we wont run into problems of conflicting jQuery libraries being loaded. All plugins that want to use jQuery-UI should use this plugin as a requirement.", "license": "GPL-3.0-or-later", - "version": "1.12.0", + "version": "1.13.1", "authors": [ { "name": "Thomas Bruederli", diff --git a/roundcubemail.spec b/roundcubemail.spec index 202e368..c7ca4dd 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -18,7 +18,7 @@ %else %global with_phpfpm 0 %endif -%global upstream_version 1.6.0 +%global upstream_version 1.6.1 #global upstream_prever rc %global roundcubedir %{_datadir}/roundcubemail @@ -39,7 +39,7 @@ Summary: Round Cube Webmail is a browser-based multilingual IMAP client # https://github.com/pear/Crypt_GPG # http://jqueryui.com/ # http://www.tinymce.com/ -License: GPLv3+ with exceptions and GPLv3+ and GPLv2 and LGPLv2+ and CC-BY-SA and MIT and BSD and PHP +License: GPL-3.0-or-later AND GPL-2.0-only AND LGPL-2.0-or-later AND CC-BY-SA-3.0 AND MIT AND BSD-2-Clause AND BSD-3-Clause AND PHP-3.01 URL: http://www.roundcube.net Source0: https://github.com/roundcube/roundcubemail/releases/download/%{upstream_version}%{?upstream_prever:-%{upstream_prever}}/roundcubemail-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}-complete.tar.gz @@ -145,11 +145,11 @@ Provides: bundled(js-tinymce-langs) = 5.8.2 # License BSD Provides: bundled(php-pear-auth-sasl) = v1.1.0 # License BSD-2-Clause -Provides: bundled(php-bacon-bacon-qr-code) = 2.0.7 +Provides: bundled(php-bacon-bacon-qr-code) = 2.0.8 Provides: bundled(php-dasprid-enum) = 1.0.3 Provides: bundled(php-pear-console-getopt) = v1.4.3 -Provides: bundled(php-pear-net-sieve) = 1.4.5 -Provides: bundled(php-pear-net-smtp) = 1.10.0 +Provides: bundled(php-pear-net-sieve) = 1.4.6 +Provides: bundled(php-pear-net-smtp) = 1.10.1 Provides: bundled(php-pear-pear-exception) = v1.0.2 # License BSD-3-Clause Provides: bundled(php-pear-mail-mime) = 1.10.11 @@ -164,16 +164,16 @@ Provides: bundled(php-pear-crypt-gpg) = v1.6.7 # License LGPL-3.0 Provides: bundled(php-pear-net-ldap2) = v2.2.0 # License MIT -Provides: bundled(php-guzzlehttp-guzzle) = 7.4.5 -Provides: bundled(php-guzzlehttp-promises) = 1.5.1 -Provides: bundled(php-guzzlehttp-psr7) = 2.4.0 -Provides: bundled(php-masterminds-html5) = 2.7.5 +Provides: bundled(php-guzzlehttp-guzzle) = 7.5.0 +Provides: bundled(php-guzzlehttp-promises) = 1.5.2 +Provides: bundled(php-guzzlehttp-psr7) = 2.4.3 +Provides: bundled(php-masterminds-html5) = 2.7.6 Provides: bundled(php-pear-console-commandline) = v1.2.4 Provides: bundled(php-psr-http-client) = 1.0.1 Provides: bundled(php-psr-http-factory) = 1.0.1 Provides: bundled(php-psr-http-message) = 1.0.1 Provides: bundled(php-ralouphie-getallheaders) = 3.0.3 -Provides: bundled(php-symfony-deprecation-contracts) = v2.2.0 +Provides: bundled(php-symfony-deprecation-contracts) = v3.2.0 # License PHP License Provides: bundled(php-pear-net-socket) = v1.2.2 @@ -327,6 +327,10 @@ fi %changelog +* Tue Jan 24 2023 Remi Collet <remi@remirepo.net> - 1.6.1-1 +- update to 1.6.1 +- use SPDX license id + * Wed Aug 3 2022 Remi Collet <remi@remirepo.net> - 1.6.0-1 - update to 1.6.0 |