diff options
| -rw-r--r-- | composer.json | 3 | ||||
| -rw-r--r-- | phpMyAdmin.spec | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/composer.json b/composer.json index d7d70ce..02266a1 100644 --- a/composer.json +++ b/composer.json @@ -45,6 +45,9 @@ "phpseclib/phpseclib": "^2.0", "google/recaptcha": "^1.1" }, + "conflict": { + "phpseclib/phpseclib": "2.0.8" + }, "suggest": { "ext-openssl": "Cookie encryption", "ext-curl": "Updates checking", diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 0a5474d..443e713 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -22,7 +22,7 @@ %endif Name: phpMyAdmin -Version: 4.7.5 +Version: 4.7.6 Release: 1%{?dist} Summary: Web based MySQL browser written in php @@ -65,6 +65,8 @@ Suggests: httpd # "tecnickcom/tcpdf": "^6.2", # "phpseclib/phpseclib": "^2.0", # "google/recaptcha": "^1.1" +# "conflict": { +# "phpseclib/phpseclib": "2.0.8" Requires: php(language) >= 5.5 Requires: php-mbstring Requires: php-mysqli @@ -82,7 +84,7 @@ Requires: php-composer(tecnickcom/tcpdf) < 7 Requires: php-composer(tecnickcom/tcpdf) >= 6.2 Requires: php-tcpdf-dejavu-sans-fonts Requires: php-composer(phpseclib/phpseclib) < 3 -Requires: php-composer(phpseclib/phpseclib) >= 2.0 +Requires: php-composer(phpseclib/phpseclib) >= 2.0.9 Requires: php-composer(google/recaptcha) < 2 Requires: php-composer(google/recaptcha) >= 1.1 # Autoloader @@ -260,6 +262,10 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \ %changelog +* Fri Dec 1 2017 Remi Collet <remi@remirepo.net> 4.7.6-1 +- update to 4.7.6 (2017-12-01, regular maintenance release) +- raise dependency on phpseclib/phpseclib 2.0.9 + * Mon Oct 23 2017 Remi Collet <remi@remirepo.net> 4.7.5-1 - update to 4.7.5 (2017-10-23, regular maintenance release) - raise dependency on phpmyadmin/sql-parser version 4.2.3 |