diff options
| -rw-r--r-- | phpMyAdmin.spec | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index ca698b0..7ef3548 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -10,7 +10,7 @@ # Please, preserve the changelog entries # %{!?_pkgdocdir: %global _pkgdocdir %{_datadir}/doc/%{name}-%{version}} -%if 0%{?fedora} >= 21 +%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 # nginx 1.6 with nginx-filesystem %global with_nginx 1 # httpd 2.4 with httpd-filesystem @@ -20,8 +20,6 @@ %global with_httpd 0 %endif -## TODO pragmarx/google2fa and samyoul/u2f-php-server - %global upstream_version 4.8.0 %global upstream_prever alpha1 @@ -132,10 +130,11 @@ 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(pragmarx/google2fa) >= 2.0 -Recommends: php-composer(bacon/bacon-qr-code) >= 1.0 -Recommends: php-tcpdf-dejavu-sans-fonts >= 6.2 +Recommends: php-composer(tecnickcom/tcpdf) >= 6.2 +Recommends: php-composer(pragmarx/google2fa) >= 2.0 +Recommends: php-composer(bacon/bacon-qr-code) >= 1.0 +Recommends: php-composer(samyoul/u2f-php-server) >= 1.1 +Recommends: php-tcpdf-dejavu-sans-fonts >= 6.2 %endif # From phpcompatinfo reports for 4.8.0 Requires: php-date @@ -222,7 +221,9 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; ]); \Fedora\Autoloader\Dependencies::optional([ '%{_datadir}/php/tcpdf/autoload.php', + '%{_datadir}/php/PragmaRX/Google2FA/autoload.php', '%{_datadir}/php/BaconQrCode/autoload.php', + '%{_datadir}/php/Samyoul/U2F/U2FServer/autoload.php', ]); EOF @@ -306,7 +307,8 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \ %changelog * Wed Mar 7 2018 Remi Collet <remi@remirepo.net> 4.8.0~alpha1-3 -- add optional dependency on pragmarx/google2fa +- add optional dependency on pragmarx/google2fa, review #1552442 +- add optional dependency on samyoul/u2f-php-server, review #1552450 * Thu Mar 1 2018 Remi Collet <remi@remirepo.net> 4.8.0~alpha1-2 - update to 4.8.0-alpha1 |