diff options
| -rw-r--r-- | composer.json | 8 | ||||
| -rw-r--r-- | roundcubemail.spec | 26 |
2 files changed, 23 insertions, 11 deletions
diff --git a/composer.json b/composer.json index a37bf57..6553f3f 100644 --- a/composer.json +++ b/composer.json @@ -5,17 +5,16 @@ "repositories": [ { "type": "composer", - "url": "https://plugins.roundcube.net/" + "url": "https://plugins.roundcube.net" } ], "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.3", "pear/net_sieve": "~1.4.3", "roundcube/plugin-installer": "~0.1.6", @@ -26,5 +25,8 @@ }, "require-dev": { "phpunit/phpunit": "^4.8.36 || ^5.7.21" + }, + "suggest": { + "mkopinsky/zxcvbn-php": "^4.4.2 required for Zxcvbn password strength driver" } } diff --git a/roundcubemail.spec b/roundcubemail.spec index b5b1616..137ac8c 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -18,7 +18,7 @@ %global with_phpfpm 0 %endif %global upstream_version 1.4 -%global upstream_prever beta +%global upstream_prever rc1 %global roundcubedir %{_datadir}/roundcubemail %global _logdir /var/log @@ -55,11 +55,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 @@ -110,11 +109,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", @@ -124,11 +122,10 @@ 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 @@ -137,6 +134,9 @@ Requires: php-composer(kolab/net_ldap3) >= 1.0.6 %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) +# 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) # remirepo:6 %else Requires: php-composer(endroid/qrcode) < 2 @@ -226,6 +226,9 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; '%{_datadir}/php/Endroid/QrCode/autoload.php', '%{_datadir}/php/Masterminds/HTML5/autoload.php', ]); +\Fedora\Autoloader\Dependencies::optional([ + '%{_datadir}/php/ZxcvbnPhp/autoload.php', +]); EOF @@ -295,7 +298,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)) { @@ -319,6 +322,7 @@ fi %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc CHANGELOG INSTALL README.md UPGRADING README-rpm.txt @@ -347,6 +351,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 + * Mon Sep 17 2018 Remi Collet <remi@remirepo.net> - 1.4~beta-1 - Update to 1.4-beta - raise dependency on pear/net_sieve 1.4.3 |