summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-09-02 15:39:25 +0200
committerRemi Collet <remi@remirepo.net>2019-09-02 15:39:25 +0200
commit8eec2a2c5bcbe271b01c9c3d111c723e84501489 (patch)
tree6c07ae26281ca90fa7293a7008cab3b96ff34e34
parent13329f6a0a4cb7c4ee11c5110a6000cfd534fe64 (diff)
- make optional depencencies mandatory on EL <= 7
see https://superuser.com/questions/1472237
-rw-r--r--phpMyAdmin.spec14
1 files changed, 12 insertions, 2 deletions
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 83ece93..9661e4b 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -25,7 +25,7 @@
Name: phpMyAdmin
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Web based MySQL browser written in php
# MIT (js/jquery/, js/jqplot, js/codemirror/, js/tracekit/)
@@ -137,13 +137,19 @@ Recommends: php-composer(pragmarx/google2fa) >= 3.0.1
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
+%else
+Requires: php-tcpdf >= 6.2
+Requires: php-pragmarx-google2fa >= 3.0.1
+Requires: php-bacon-qr-code >= 1.0
+Requires: php-samyoul-u2f-php-server >= 1.1
+Requires: php-tcpdf-dejavu-sans-fonts >= 6.2
%endif
# From phpcompatinfo reports for 4.8.0
+# notice: recode is optional (iconv or mbstring are preferred / used first)
Requires: php-date
Requires: php-filter
Requires: php-iconv
Requires: php-libxml
-Requires: php-recode
Requires: php-session
Requires: php-simplexml
Requires: php-spl
@@ -311,6 +317,10 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \
%changelog
+* Mon Sep 2 2019 Remi Collet <remi@remirepo.net> - 4.9.0.1-2
+- make optional depencencies mandatory on EL <= 7
+ see https://superuser.com/questions/1472237
+
* Tue Jun 4 2019 Remi Collet <remi@remirepo.net> - 4.9.0.1-1
- update to 4.9.0.1 (2019-06-04, important security fixes)
- raise dependency on phpmyadmin/sql-parser version 4.3.2