From 01d2e224ff307e1bdd0d3fce0776103c02a04a5a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mar 01 2019 08:45:54 +0000
Subject: Update to 1.4-rc1

raise dependency on pear/net_smtp 1.8.1
drop dependency on pear/net_socket
add weak dependency on mkopinsky/zxcvbn-php

---

diff --git a/.gitignore b/.gitignore
index 0cb2109..a23f536 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ clog
 /roundcubemail-1.3.6-complete.tar.gz
 /roundcubemail-1.3.7-complete.tar.gz
 /roundcubemail-1.4-beta-complete.tar.gz
+/roundcubemail-1.4-rc1-complete.tar.gz
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 4bc7bb8..6223276 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -11,8 +11,8 @@
 # support for apache / nginx / php-fpm
 %global with_phpfpm 1
 %global upstream_version     1.4
-%global upstream_prever      beta
-%global rpmrel               1
+%global upstream_prever      rc1
+%global rpmrel               2
 
 %global roundcubedir %{_datadir}/roundcubemail
 %global _logdir /var/log  
@@ -51,11 +51,10 @@ BuildArch: noarch
 # For test
 BuildRequires: php-cli
 BuildRequires: php-pear(PEAR)            >= 1.10.1
-BuildRequires: php-pear(Net_Socket)      >= 1.2.1
 BuildRequires: php-pear(Auth_SASL)       >= 1.1.0
 BuildRequires: php-pear(Net_IDNA2)       >= 0.2.0
 BuildRequires: php-pear(Mail_Mime)       >= 1.10.0
-BuildRequires: php-pear(Net_SMTP)        >= 1.7.1
+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
@@ -97,11 +96,10 @@ Requires: php-xml
 # From composer.json-dist, require
 #        "php": ">=5.4.0",
 #        "pear/pear-core-minimal": "~1.10.1",
-#        "pear/net_socket": "~1.2.1",
 #        "pear/auth_sasl": "~1.1.0",
 #        "pear/net_idna2": "~0.2.0",
 #        "pear/mail_mime": "~1.10.0",
-#        "pear/net_smtp": "~1.7.1",
+#        "pear/net_smtp": "~1.8.1",
 #        "pear/crypt_gpg": "~1.6.0",
 #        "pear/net_sieve": "~1.4.3",
 #        "roundcube/plugin-installer": "~0.1.6",
@@ -111,17 +109,20 @@ Requires: php-xml
 #        "kolab/net_ldap3": "~1.0.6"
 #   not available and doesn't make sense roundcube/plugin-installer
 Requires: php-pear(PEAR)            >= 1.10.1
-Requires: php-pear(Net_Socket)      >= 1.2.1
 Requires: php-pear(Auth_SASL)       >= 1.1.0
 Requires: php-pear(Net_IDNA2)       >= 0.2.0
 Requires: php-pear(Mail_Mime)       >= 1.10.0
-Requires: php-pear(Net_SMTP)        >= 1.7.1
+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(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)
+# 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)
+
 # mailcap for /etc/mime.types
 Requires: mailcap
 # Autoloader
@@ -269,7 +270,7 @@ rm    %{buildroot}%{roundcubedir}/composer.json-dist
 php -r '
 require "%{buildroot}%{roundcubedir}/vendor/autoload.php";
 $cl = [ "Auth_SASL", "Crypt_GPG", "Mail_mime", "Net_IDNA2", "Net_LDAP2", "Masterminds\\HTML5",
-        "Net_LDAP3", "Net_Sieve", "Net_SMTP", "Net_Socket", "PEAR" , "Endroid\\QrCode\\QrCode" ];
+        "Net_LDAP3", "Net_Sieve", "Net_SMTP", "PEAR" , "Endroid\\QrCode\\QrCode" ];
 $ret = 0;
 foreach ($cl as $c) {
   if (class_exists($c)) {
@@ -293,7 +294,6 @@ fi
 
 
 %files
-%{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc CHANGELOG INSTALL README.md UPGRADING README-rpm.txt
 %doc composer.json-dist
@@ -321,6 +321,12 @@ fi
 
 
 %changelog
+* 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
+- drop dependency on pear/net_socket
+- add weak dependency on mkopinsky/zxcvbn-php
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-0.1.beta.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 06c8e9a..d6f4b6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (roundcubemail-1.4-beta-complete.tar.gz) = 75bd8930893a5962cf9247514b0d3248277272b605c8c4db4cebb88d41bd07a9272816edbb4b23e3aeeb5ce05e80ec268310e2d18894a39775cc8b3e354dda44
+SHA512 (roundcubemail-1.4-rc1-complete.tar.gz) = f25269c925cc8809b21c3a5c09b0817d487ef4f08b26272f1174b9f3499877c607f5727edc6ea8f14df54d87e9d0ad7c71e2f6c383ffa105f106e29ca68b2445