From be7243cdad4406bc147164feecdc575ed355bf73 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sat, 23 Sep 2023 07:00:55 +0200
Subject: update to 1.5.4

---
 composer.json      |  6 ++----
 roundcubemail.spec | 25 ++++++++++++++-----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/composer.json b/composer.json
index 119f977..6421c2a 100644
--- a/composer.json
+++ b/composer.json
@@ -21,10 +21,8 @@
         "masterminds/html5": "~2.7.0",
         "endroid/qr-code": "~1.6.5",
         "guzzlehttp/guzzle": "^6.5.5",
-        "kolab/net_ldap3": "~1.1.1"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6 || ^7"
+        "kolab/net_ldap3": "~1.1.1",
+        "symfony/polyfill-intl-idn": "1.19.0"
     },
     "suggest": {
         "bjeavons/zxcvbn-php": "^1.0 required for Zxcvbn password strength driver"
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 90e0e7e..6a2e49c 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -18,7 +18,7 @@
 %else
 %global with_phpfpm 0
 %endif
-%global upstream_version     1.5.3
+%global upstream_version     1.5.4
 #global upstream_prever      rc
 
 %global roundcubedir %{_datadir}/roundcubemail
@@ -136,21 +136,21 @@ Provides: bundled(js-lessjs) = 3.13.0
 # see vendor/composer/installed.json
 Provides: bundled(php-endroid-qr-code) = 1.6.6
 Provides: bundled(php-guzzlehttp-guzzle) = 6.5.8
-Provides: bundled(php-guzzlehttp-promises) = 1.5.1
-Provides: bundled(php-guzzlehttp-psr7) = 1.9.0
-Provides: bundled(php-kolab-net-ldap3) = v1.1.4
-Provides: bundled(php-masterminds-html5) = 2.7.5
+Provides: bundled(php-guzzlehttp-promises) = 1.5.3
+Provides: bundled(php-guzzlehttp-psr7) = 1.9.1
+Provides: bundled(php-kolab-net-ldap3) = v1.1.5
+Provides: bundled(php-masterminds-html5) = 2.7.6
 Provides: bundled(php-paragonie-random-compat) = v2.0.21
 Provides: bundled(php-pear-auth-sasl) = v1.1.0
-Provides: bundled(php-pear-console-commandline) = v1.2.4
+Provides: bundled(php-pear-console-commandline) = v1.2.6
 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-ldap2) = v2.2.1
+Provides: bundled(php-pear-net-sieve) = 1.4.6
+Provides: bundled(php-pear-net-smtp) = 1.10.1
 Provides: bundled(php-pear-net-socket) = v1.2.2
-Provides: bundled(php-pear-pear-core-minimal) = v1.10.11
+Provides: bundled(php-pear-pear-core-minimal) = v1.10.13
 Provides: bundled(php-pear-pear-exception) = v1.0.2
 Provides: bundled(php-psr-http-message) = 1.0.1
 Provides: bundled(php-ralouphie-getallheaders) = 2.0.5
@@ -175,7 +175,7 @@ CSS 2.
 
 %prep
 %setup -q -n roundcubemail-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}
-%patch1 -p1 -b .rpm
+%patch -P1 -p1 -b .rpm
 
 : PHP bundled libraries
 php %{SOURCE5} vendor/composer/installed.json
@@ -311,6 +311,9 @@ fi
 
 
 %changelog
+* Sat Sep 23 2023 Remi Collet <remi@remirepo.net> - 1.5.4-1
+- update to 1.5.4
+
 * Mon Jun 27 2022 Remi Collet <remi@remirepo.net> - 1.5.3-1
 - update to 1.5.3
 
-- 
cgit