From 38bc7b40ea2afbe5872f04cb2ca07dafe110d20c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Jun 27 2022 05:57:26 +0000 Subject: update to 1.6-rc drop patch merged upstream --- diff --git a/.gitignore b/.gitignore index c5af99d..cae7828 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ clog /roundcubemail-1.5.1-complete.tar.gz /roundcubemail-1.5.2-complete.tar.gz /roundcubemail-1.6-beta-complete.tar.gz +/roundcubemail-1.6-rc-complete.tar.gz diff --git a/roundcubemail-1.6-legacy.patch b/roundcubemail-1.6-legacy.patch deleted file mode 100644 index dc88baf..0000000 --- a/roundcubemail-1.6-legacy.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 425c93ff6096d9bf6e7cfdba228ecf4fcdc6b3d5 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Mon, 7 Mar 2022 12:31:42 +0100 -Subject: [PATCH] add imap and smtp host in legacy config options - ---- - program/lib/Roundcube/rcube_config.php | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/program/lib/Roundcube/rcube_config.php b/program/lib/Roundcube/rcube_config.php -index e706226651..d7bb8463fa 100644 ---- a/program/lib/Roundcube/rcube_config.php -+++ b/program/lib/Roundcube/rcube_config.php -@@ -55,6 +55,8 @@ class rcube_config - 'mail_read_time' => 'preview_pane_mark_read', - 'session_debug' => 'log_session', - 'redundant_attachments_cache_ttl' => 'redundant_attachments_memcache_ttl', -+ 'imap_host' => 'default_host', -+ 'smtp_host' => 'smtp_server', - ]; - - /** diff --git a/roundcubemail.spec b/roundcubemail.spec index 79e7595..9184543 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -12,7 +12,7 @@ # support for apache / nginx / php-fpm %global with_phpfpm 1 %global upstream_version 1.6 -%global upstream_prever beta +%global upstream_prever rc %global roundcubedir %{_datadir}/roundcubemail %global _logdir /var/log @@ -45,8 +45,6 @@ Source5: roundcubemail-bundled.php # Non-upstreamable: Adjusts config path to Fedora policy Patch1: roundcubemail-1.6-confpath.patch -# See https://github.com/roundcube/roundcubemail/pull/846 -Patch2: roundcubemail-1.6-legacy.patch BuildArch: noarch @@ -116,41 +114,57 @@ Suggests: php-pam # Bundled JS libraries # see https://github.com/roundcube/roundcubemail/blob/master/jsdeps.json -Provides: bundled(js-jquery) = 3.5.1 -Provides: bundled(js-jstimezonedetect) = 1.0.7 +# License Apache-2.0 +Provides: bundled(js-lessjs) = 3.13.0 +# License GPLv3 Provides: bundled(js-publickey) = 0e011cb1 -Provides: bundled(js-tinymce) = 5.8.2 -Provides: bundled(js-tinymce-langs) = 5.8.2 +# License LGPL Provides: bundled(js-openpgp) = 5.0.0 -Provides: bundled(js-codemirror) = 5.58.3 +Provides: bundled(js-tinymce) = 5.8.2 +# License MIT Provides: bundled(js-bootstrap) = 4.5.3 -Provides: bundled(js-lessjs) = 3.13.0 +Provides: bundled(js-codemirror) = 5.58.3 +Provides: bundled(js-jquery) = 3.5.1 +Provides: bundled(js-jstimezonedetect) = 1.0.7 +# License Unkown +Provides: bundled(js-tinymce-langs) = 5.8.2 + # Bundled PHP libraries # see vendor/composer/installed.json -Provides: bundled(php-dasprid-enum) = 1.0.3 -Provides: bundled(php-guzzlehttp-guzzle) = 7.4.1 -Provides: bundled(php-guzzlehttp-promises) = 1.5.1 -Provides: bundled(php-guzzlehttp-psr7) = 2.1.0 -Provides: bundled(php-kolab-net-ldap3) = v1.1.3 -Provides: bundled(php-masterminds-html5) = 2.7.5 +# License BSD Provides: bundled(php-pear-auth-sasl) = v1.1.0 -Provides: bundled(php-pear-console-commandline) = v1.2.4 +# License BSD-2-Clause +Provides: bundled(php-bacon-bacon-qr-code) = 2.0.7 +Provides: bundled(php-dasprid-enum) = 1.0.3 Provides: bundled(php-pear-console-getopt) = v1.4.3 -Provides: bundled(php-pear-crypt-gpg) = v1.6.7 -Provides: bundled(php-pear-mail-mime) = 1.10.11 -Provides: bundled(php-pear-net-ldap2) = v2.2.0 Provides: bundled(php-pear-net-sieve) = 1.4.5 Provides: bundled(php-pear-net-smtp) = 1.10.0 -Provides: bundled(php-pear-net-socket) = v1.2.2 -Provides: bundled(php-pear-pear-core-minimal) = v1.10.11 Provides: bundled(php-pear-pear-exception) = v1.0.2 +# License BSD-3-Clause +Provides: bundled(php-pear-mail-mime) = 1.10.11 +Provides: bundled(php-pear-pear-core-minimal) = v1.10.11 +# License GPL-2.0 +Provides: bundled(php-roundcube-rtf-html-php) = v2.1 +# License GPL-3.0+ +Provides: bundled(php-kolab-net-ldap3) = v1.1.3 +Provides: bundled(php-roundcube-plugin-installer) = 0.3.1 +# License LGPL-2.1 +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.4 +Provides: bundled(php-guzzlehttp-promises) = 1.5.1 +Provides: bundled(php-guzzlehttp-psr7) = 2.3.0 +Provides: bundled(php-masterminds-html5) = 2.7.5 +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-roundcube-plugin-installer) = 0.3.1 -Provides: bundled(php-roundcube-rtf-html-php) = v2.1 -Provides: bundled(php-symfony-deprecation-contracts) = v2.2.0 +Provides: bundled(php-symfony-deprecation-contracts) = v3.1.0 +# License PHP License +Provides: bundled(php-pear-net-socket) = v1.2.2 %description @@ -167,7 +181,6 @@ CSS 2. %prep %setup -q -n roundcubemail-%{upstream_version}%{?upstream_prever:-%{upstream_prever}} %patch1 -p1 -b .rpm -%patch2 -p1 : PHP bundled libraries php %{SOURCE5} vendor/composer/installed.json @@ -301,6 +314,10 @@ fi %changelog +* Mon Jun 13 2022 Remi Collet - 1.6~rc-1 +- update to 1.6-rc +- drop patch merged upstream + * Mon Mar 7 2022 Remi Collet - 1.6~beta-1 - update to 1.6-beta - raise dependency on PHP 7.3 diff --git a/sources b/sources index 8714798..c4ef2c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (roundcubemail-1.6-beta-complete.tar.gz) = 8a8bc9749203980d33ede7b221b96e0990b4afbe41db65fca74f0a49334adcae717306d4fe8fe1a5c938bf9fbcb5c4745d4d67bc5a587503aa3a2e9cb8f6384b +SHA512 (roundcubemail-1.6-rc-complete.tar.gz) = f12f7858b19ce16613ed02a8b4cf7b4fe16753454b7c4cf4e92bbb2d11de4ba1e00b09ba70b387133613967654aadaaf09167ed16c54809885eb48adcf54de5f