diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | roundcubemail.spec | 68 |
2 files changed, 41 insertions, 29 deletions
diff --git a/composer.json b/composer.json index 537cbb5..fb57f03 100644 --- a/composer.json +++ b/composer.json @@ -30,6 +30,6 @@ }, "suggest": { "pear/net_ldap2": "~2.2.0 required for connecting to LDAP", - "kolab/Net_LDAP3": "dev-master required for connecting to LDAP" + "kolab/net_ldap3": "dev-master required for connecting to LDAP" } } diff --git a/roundcubemail.spec b/roundcubemail.spec index 65b6f7a..51428b6 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -20,7 +20,7 @@ %global roundcubedir %{_datadir}/roundcubemail %global _logdir /var/log Name: roundcubemail -Version: 1.3.9 +Version: 1.3.10 Release: 1%{?dist} Summary: Round Cube Webmail is a browser-based multilingual IMAP client @@ -53,20 +53,23 @@ Patch2: roundcubemail-pr313.patch 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(Crypt_GPG) >= 1.6.0 -BuildRequires: php-pear(Net_Sieve) >= 1.4.0 -BuildRequires: php-composer(endroid/qrcode) < 2 -BuildRequires: php-composer(endroid/qrcode) >= 1.6.5 -BuildRequires: php-pear(Net_LDAP2) >= 2.2.0 -BuildRequires: php-composer(kolab/Net_LDAP3) -BuildRequires: php-composer(fedora/autoloader) +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(Crypt_GPG) >= 1.6.0 +BuildRequires: php-pear(Net_Sieve) >= 1.4.0 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(endroid/qrcode) >= 1.6.5 with php-composer(endroid/qrcode) < 2) +%else +BuildRequires: php-endroid-qrcode >= 1.6.5 +%endif +BuildRequires: php-pear(Net_LDAP2) >= 2.2.0 +BuildRequires: php-composer(kolab/net_ldap3) +BuildRequires: php-composer(fedora/autoloader) %if %{with_phpfpm} @@ -112,21 +115,26 @@ Requires: php-xml # "roundcube/plugin-installer": "~0.1.6", # "endroid/qrcode": "~1.6.5" # 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(Crypt_GPG) >= 1.6.0 -Requires: php-pear(Net_Sieve) >= 1.4.0 -Requires: php-composer(endroid/qrcode) < 2 -Requires: php-composer(endroid/qrcode) >= 1.6.5 +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(Crypt_GPG) >= 1.6.0 +Requires: php-pear(Net_Sieve) >= 1.4.0 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(endroid/qrcode) >= 1.6.5 with php-composer(endroid/qrcode) < 2) # From composer.json-dist, suggest # "pear/net_ldap2": "~2.2.0 required for connecting to LDAP", -# "kolab/Net_LDAP3": "dev-master required for connecting to LDAP" -Requires: php-pear(Net_LDAP2) >= 2.2.0 -Requires: php-composer(kolab/Net_LDAP3) +# "kolab/net_ldap3": "dev-master required for connecting to LDAP" +Recommends: php-pear(Net_LDAP2) >= 2.2.0 +Recommends: php-composer(kolab/net_ldap3) +%else +Requires: php-endroid-qrcode >= 1.6.5 +Requires: php-pear(Net_LDAP2) >= 2.2.0 +Requires: php-composer(kolab/net_ldap3) +%endif # mailcap for /etc/mime.types Requires: mailcap # Autoloader @@ -326,6 +334,10 @@ fi %changelog +* Thu Aug 29 2019 Remi Collet <remi@remirepo.net> - 1.3.10-1 +- update to 1.3.10 +- use range dependencies + * Sun Mar 31 2019 Remi Collet <remi@remirepo.net> - 1.3.9-1 - update to 1.3.9 |