diff options
| author | Remi Collet <remi@remirepo.net> | 2019-12-02 17:00:09 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-12-02 17:00:09 +0100 |
| commit | 5549c92849b708f85245127ff9cfbb86d73c3702 (patch) | |
| tree | d85d21d69bcf158250806e3eab81617bf7c9d8e2 | |
| parent | a05438f76d2f9bc5eb39865b2ed94fb0c317729c (diff) | |
5.0rc1
| -rw-r--r-- | composer.json | 3 | ||||
| -rw-r--r-- | phpMyAdmin.spec | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/composer.json b/composer.json index dc1edc4..6ef2747 100644 --- a/composer.json +++ b/composer.json @@ -63,6 +63,7 @@ "conflict": { "phpseclib/phpseclib": "2.0.8", "tecnickcom/tcpdf": "<6.2", + "pragmarx/google2fa": ">=6.1", "pragmarx/google2fa-qrcode": "<1.0.1", "samyoul/u2f-php-server": "<1.1" }, @@ -88,7 +89,7 @@ "pragmarx/google2fa-qrcode": "^1.0.1", "samyoul/u2f-php-server": "^1.1", "squizlabs/php_codesniffer": "^3.0", - "tecnickcom/tcpdf": "^6.2" + "tecnickcom/tcpdf": "^6.3" }, "extra": { "branch-alias": { diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 1ad41e4..68ec52f 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -21,11 +21,11 @@ %endif %global upstream_version 5.0.0 -%global upstream_prever alpha1 +%global upstream_prever rc1 Name: phpMyAdmin Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: A web interface for MySQL and MariaDB # MIT (js/jquery/, js/jqplot, js/codemirror/, js/tracekit/) @@ -41,8 +41,6 @@ Source4: https://files.phpmyadmin.net/phpmyadmin.keyring # Redirect to system certificates Patch0: phpMyAdmin-certs.patch -# Upstream patches -Patch1: https://github.com/phpmyadmin/phpmyadmin/commit/5b67d2189cd930ceb4e72da737dbd267b781daf9.patch BuildArch: noarch BuildRequires: gnupg2 @@ -142,12 +140,12 @@ Requires: php-gd Requires: php-mbstring %if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 Recommends: php-opcache -Recommends: php-composer(tecnickcom/tcpdf) >= 6.2 +Recommends: php-composer(tecnickcom/tcpdf) >= 6.3 Recommends: php-composer(pragmarx/google2fa-qrcode) >= 1.0.1 Recommends: php-composer(samyoul/u2f-php-server) >= 1.1 Recommends: php-tcpdf-dejavu-sans-fonts >= 6.2 %else -Requires: php-tcpdf >= 6.2 +Requires: php-tcpdf >= 6.3 Requires: php-pragmarx-google2fa-qrcode >= 1.0.1 Requires: php-samyoul-u2f-php-server >= 1.1 Requires: php-tcpdf-dejavu-sans-fonts >= 6.2 @@ -192,7 +190,6 @@ is available in 50 languages %setup -qn phpMyAdmin-%{upstream_version}%{?upstream_prever:-%upstream_prever}-all-languages %patch0 -p1 -%patch1 -p1 # Minimal configuration file sed -e "/'blowfish_secret'/s@''@'MUSTBECHANGEDONINSTALL'@" \ @@ -322,6 +319,9 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \ %changelog +* Sat Nov 23 2019 Remi Collet <remi@remirepo.net> - 5.0.0~rc1-2 +- update to 5.0.0rc1 + * Fri Sep 13 2019 Remi Collet <remi@remirepo.net> - 5.0.0~alpha1-2 - temporary allow Symfony 4.1 on old EL |