summaryrefslogtreecommitdiffstats
path: root/phpMyAdmin.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-04-11 09:24:41 +0200
committerRemi Collet <remi@remirepo.net>2018-04-11 09:24:41 +0200
commit3316823739d477be6cab64499a7e110a2e720abd (patch)
tree3c4dc27d615064c42809f2f2b339b8fe42b693ac /phpMyAdmin.spec
parent8270c648910a903cb13fe6a3e98202d2e2d74f45 (diff)
add dependency on symfony/polyfill-mbstring for PHP < 7.2
Diffstat (limited to 'phpMyAdmin.spec')
-rw-r--r--phpMyAdmin.spec10
1 files changed, 8 insertions, 2 deletions
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 15aa19d..8fde68c 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/)
@@ -94,6 +94,7 @@ Requires: (php-composer(psr/container) >= 1.0 with php-composer
Requires: (php-composer(twig/twig) >= 1.34 with php-composer(twig/twig) < 2)
Requires: (php-composer(twig/extensions) >= 1.5.1 with php-composer(twig/extensions) < 2)
Requires: (php-composer(symfony/expression-language) >= 2.8 with php-composer(symfony/expression-language) < 4)
+Requires: (php-composer(symfony/polyfill-mbstring) >= 1.3 with php-composer(symfony/polyfill-mbstring) < 2)
%else
Requires: php-phpmyadmin-sql-parser >= 4.2.3
Requires: php-phpmyadmin-motranslator >= 4.0
@@ -105,6 +106,8 @@ Requires: php-twig >= 1.34
Requires: php-twig-extensions >= 1.5.1
Requires: php-symfony-expression-language < 4
%endif
+# 1.7.0-2 with polyfill-mbstring
+Requires: php-symfony-polyfill >= 1.7.0-2
# Autoloader
Requires: php-composer(fedora/autoloader)
# From composer.json, "suggest": {
@@ -126,7 +129,6 @@ Requires: php-zlib
Requires: php-bz2
Requires: php-zip
Requires: php-gd
-# Keep mandatory to avoid polyfill
Requires: php-mbstring
%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
Recommends: php-opcache
@@ -218,6 +220,7 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
'%{_datadir}/php/Symfony3/Component/ExpressionLanguage/autoload.php',
'%{_datadir}/php/Symfony/Component/ExpressionLanguage/autoload.php',
],
+ '%{_datadir}/php/Symfony/Polyfill/autoload.php',
]);
\Fedora\Autoloader\Dependencies::optional([
'%{_datadir}/php/tcpdf/autoload.php',
@@ -306,6 +309,9 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \
%changelog
+* Wed Apr 11 2018 Remi Collet <remi@remirepo.net> 4.8.0-2
+- add dependency on symfony/polyfill-mbstring for PHP < 7.2
+
* Mon Apr 9 2018 Remi Collet <remi@remirepo.net> 4.8.0-1
- update to 4.8.0 (2018-04-07, new features release)