diff options
| -rw-r--r-- | roundcubemail-1.6-legacy.patch | 22 | ||||
| -rw-r--r-- | roundcubemail.spec | 17 |
2 files changed, 9 insertions, 30 deletions
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 <remi@remirepo.net> -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 13c89ad..cb4aa38 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -19,7 +19,7 @@ %global with_phpfpm 0 %endif %global upstream_version 1.6 -%global upstream_prever beta +%global upstream_prever rc %global roundcubedir %{_datadir}/roundcubemail %global _logdir /var/log @@ -52,8 +52,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 @@ -147,7 +145,7 @@ 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.6 +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-net-sieve) = 1.4.5 @@ -166,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.1 +Provides: bundled(php-guzzlehttp-guzzle) = 7.4.4 Provides: bundled(php-guzzlehttp-promises) = 1.5.1 -Provides: bundled(php-guzzlehttp-psr7) = 2.1.0 +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-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 @@ -194,7 +192,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 @@ -330,6 +327,10 @@ fi %changelog +* Mon Jun 13 2022 Remi Collet <remi@remirepo.net> - 1.6~rc-1 +- update to 1.6-rc +- drop patch merged upstream + * Mon Mar 7 2022 Remi Collet <remi@remirepo.net> - 1.6~beta-1 - update to 1.6-beta - raise dependency on PHP 7.3 |