From 6f8c5bc485c29e12fe021d64ef273a9bb06212f5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 17 Sep 2019 07:18:00 +0200
Subject: - Update to 1.4-rc2 - raise dependency on masterminds/html5 2.5.0 -
 raise dependency on kolab/net_ldap3 1.1.1

---
 roundcubemail.spec | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'roundcubemail.spec')

diff --git a/roundcubemail.spec b/roundcubemail.spec
index 137ac8c..2440bd0 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -18,7 +18,7 @@
 %global with_phpfpm 0
 %endif
 %global upstream_version     1.4
-%global upstream_prever      rc1
+%global upstream_prever      rc2
 
 %global roundcubedir %{_datadir}/roundcubemail
 %global _logdir /var/log  
@@ -62,18 +62,18 @@ BuildRequires: php-pear(Net_SMTP)        >= 1.8.1
 BuildRequires: php-pear(Crypt_GPG)       >= 1.6.0
 BuildRequires: php-pear(Net_Sieve)       >= 1.4.3
 BuildRequires: php-pear(Net_LDAP2)       >= 2.2.0
-BuildRequires: php-composer(kolab/net_ldap3) >= 1.0.6
+BuildRequires: php-composer(kolab/net_ldap3) >= 1.1.1
 BuildRequires: php-composer(fedora/autoloader)
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(endroid/qrcode)    >= 1.6.5 with php-composer(endroid/qrcode)    < 2)
-BuildRequires: (php-composer(masterminds/html5) >= 2.3.0 with php-composer(masterminds/html5) <  3)
+BuildRequires: (php-composer(masterminds/html5) >= 2.5.0 with php-composer(masterminds/html5) <  3)
 # remirepo:6
 %else
 BuildRequires:  php-composer(endroid/qrcode)    <  2
 BuildRequires:  php-composer(endroid/qrcode)    >= 1.6.5
 BuildRequires:  php-composer(masterminds/html5) <  3
-BuildRequires:  php-composer(masterminds/html5) >= 2.3.0
+BuildRequires:  php-composer(masterminds/html5) >= 2.5.0
 %endif
 
 %if %{with_phpfpm}
@@ -116,10 +116,9 @@ Requires: php-xml
 #        "pear/crypt_gpg": "~1.6.0",
 #        "pear/net_sieve": "~1.4.3",
 #        "roundcube/plugin-installer": "~0.1.6",
-#        "masterminds/html5": "~2.3.0",
+#        "masterminds/html5": "~2.5.0",
 #        "endroid/qrcode": "~1.6.5"
-#        "pear/net_ldap2": "~2.2.0",
-#        "kolab/net_ldap3": "~1.0.6"
+#        "kolab/net_ldap3": "~1.1.1"
 #   not available and doesn't make sense roundcube/plugin-installer
 Requires: php-pear(PEAR)            >= 1.10.1
 Requires: php-pear(Auth_SASL)       >= 1.1.0
@@ -129,11 +128,11 @@ Requires: php-pear(Net_SMTP)        >= 1.8.1
 Requires: php-pear(Crypt_GPG)       >= 1.6.0
 Requires: php-pear(Net_Sieve)       >= 1.4.3
 Requires: php-pear(Net_LDAP2)       >= 2.2.0
-Requires: php-composer(kolab/net_ldap3) >= 1.0.6
+Requires: php-composer(kolab/net_ldap3) >= 1.1.1
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires: (php-composer(endroid/qrcode)    >= 1.6.5 with php-composer(endroid/qrcode)    <  2)
-Requires: (php-composer(masterminds/html5) >= 2.3.0 with php-composer(masterminds/html5) <  3)
+Requires: (php-composer(masterminds/html5) >= 2.5.0 with php-composer(masterminds/html5) <  3)
 # From composer.json-dist, "suggest": {
 #        "mkopinsky/zxcvbn-php": "^4.4.2 required for Zxcvbn password strength driver"
 Suggests: (php-composer(mkopinsky/zxcvbn-php) >= 4.4.2 with php-composer(mkopinsky/zxcvbn-php) <  5)
@@ -142,7 +141,7 @@ Suggests: (php-composer(mkopinsky/zxcvbn-php) >= 4.4.2 with php-composer(mkopins
 Requires:  php-composer(endroid/qrcode)    <  2
 Requires:  php-composer(endroid/qrcode)    >= 1.6.5
 Requires:  php-composer(masterminds/html5) <  3
-Requires:  php-composer(masterminds/html5) >= 2.3.0
+Requires:  php-composer(masterminds/html5) >= 2.5.0
 %endif
 # mailcap for /etc/mime.types
 Requires: mailcap
@@ -174,13 +173,13 @@ Suggests: php-gearman
 
 # Bundled JS libraries
 # see https://github.com/roundcube/roundcubemail/blob/master/jsdeps.json
-Provides: bundled(js-jquery) = 3.3.1
+Provides: bundled(js-jquery) = 3.4.1
 Provides: bundled(js-jstz) = 1.0.6
 Provides: bundled(js-publickey)
 Provides: bundled(js-tinymce) = 4.8.2
-Provides: bundled(js-openpgp) = 2.6.2
-Provides: bundled(js-codemirror) = 5.34.0
-Provides: bundled(js-bootstrap) = 4.1.2
+Provides: bundled(js-openpgp) = 4.4.6
+Provides: bundled(js-codemirror) = 5.46.0
+Provides: bundled(js-bootstrap) = 4.3.1
 Provides: bundled(js-less) = 2.7.3
 
 
@@ -351,6 +350,11 @@ fi
 
 
 %changelog
+* Tue Sep 17 2019 Remi Collet <remi@remirepo.net> - 1.4~rc2-1
+- Update to 1.4-rc2
+- raise dependency on masterminds/html5 2.5.0
+- raise dependency on kolab/net_ldap3 1.1.1
+
 * Fri Mar  1 2019 Remi Collet <remi@remirepo.net> - 1.4~rc1-1
 - Update to 1.4-rc1
 - raise dependency on pear/net_smtp 1.8.1
-- 
cgit