diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | composer.json | 5 | ||||
| -rw-r--r-- | phpMyAdmin.spec | 26 |
3 files changed, 22 insertions, 12 deletions
@@ -1,4 +1,7 @@ +clog +package-*.xml *.tgz +*.tar.bz2 *.tar.gz *.tar.xz *.tar.xz.asc diff --git a/composer.json b/composer.json index bfe6968..6716ab9 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "phpmyadmin/motranslator": "^4.0", "phpmyadmin/shapefile": "^2.0", "phpmyadmin/sql-parser": "^5.0", - "phpmyadmin/twig-i18n-extension": "^2.0", + "phpmyadmin/twig-i18n-extension": "^2.0 || ^3.0", "phpseclib/phpseclib": "^2.0", "symfony/config": "^4.2.8", "symfony/dependency-injection": "^4.2.8", @@ -57,7 +57,7 @@ "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-mbstring": "^1.3", "symfony/yaml": "^4.2.8", - "twig/twig": "^2.4", + "twig/twig": "^2.9 || ^3", "williamdes/mariadb-mysql-kbs": "^1.2" }, "conflict": { @@ -81,7 +81,6 @@ "samyoul/u2f-php-server": "For FIDO U2F authentication" }, "require-dev": { - "codacy/coverage": "^1.3.0", "php-webdriver/webdriver": "^1.7.1", "phpmyadmin/coding-standard": "^1.0", "phpstan/phpstan": "^0.11.5", diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 4768455..8ecda50 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -23,12 +23,12 @@ %global with_httpd 0 %endif -%global upstream_version 5.0.2 +%global upstream_version 5.0.3 #global upstream_prever rc1 Name: phpMyAdmin Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?dist} +Release: 1%{?dist} Summary: A web interface for MySQL and MariaDB # MIT (js/jquery/, js/jqplot, js/codemirror/, js/tracekit/) @@ -79,7 +79,7 @@ Suggests: httpd # "phpmyadmin/motranslator": "^4.0", # "phpmyadmin/shapefile": "^2.0", # "phpmyadmin/sql-parser": "^5.0", -# "phpmyadmin/twig-i18n-extension": "^2.0", +# "phpmyadmin/twig-i18n-extension": "^2.0 || ^3.0", # "phpseclib/phpseclib": "^2.0", # "symfony/config": "^4.2.8", # "symfony/dependency-injection": "^4.2.8", @@ -87,7 +87,7 @@ Suggests: httpd # "symfony/polyfill-ctype": "^1.8", # "symfony/polyfill-mbstring": "^1.3", # "symfony/yaml": "^4.2.8", -# "twig/twig": "^2.4", +# "twig/twig": "^2.9 || ^3", # "williamdes/mariadb-mysql-kbs": "^1.2" Requires: php(language) >= 7.1.3 Requires: php-hash @@ -102,14 +102,14 @@ Requires: (php-composer(google/recaptcha) >= 1.1 with php-compose Requires: (php-composer(phpmyadmin/motranslator) >= 4.0 with php-composer(phpmyadmin/motranslator) < 5) Requires: (php-composer(phpmyadmin/shapefile) >= 2.0 with php-composer(phpmyadmin/shapefile) < 3) Requires: (php-composer(phpmyadmin/sql-parser) >= 5.0 with php-composer(phpmyadmin/sql-parser) < 6) -Requires: (php-composer(phpmyadmin/twig-i18n-extension) >= 2.0 with php-composer(phpmyadmin/twig-i18n-extension) < 3) +Requires: (php-composer(phpmyadmin/twig-i18n-extension) >= 2.0 with php-composer(phpmyadmin/twig-i18n-extension) < 4) Requires: (php-composer(phpseclib/phpseclib) >= 2.0.9 with php-composer(phpseclib/phpseclib) < 3) Requires: (php-composer(symfony/config) >= 4.2.8 with php-composer(symfony/config) < 5) Requires: (php-composer(symfony/dependency-injection) >= 4.2.8 with php-composer(symfony/dependency-injection) < 5) Requires: (php-composer(symfony/expression-language) >= 4.2.8 with php-composer(symfony/expression-language) < 5) Requires: (php-composer(symfony/polyfill-mbstring) >= 1.8 with php-composer(symfony/polyfill-mbstring) < 2) Requires: (php-composer(symfony/yaml) >= 4.2.8 with php-composer(symfony/yaml) < 5) -Requires: (php-composer(twig/twig) >= 2.4 with php-composer(twig/twig) < 3) +Requires: (php-composer(twig/twig) >= 2.9 with php-composer(twig/twig) < 4) Requires: (php-composer(williamdes/mariadb-mysql-kbs) >= 1.2 with php-composer(williamdes/mariadb-mysql-kbs) < 2) # remirepo:15 %else @@ -124,7 +124,7 @@ Requires: php-symfony4-dependency-injection >= 4.1 Requires: php-symfony4-expression-language >= 4.1 Requires: php-symfony-polyfill >= 1.8.0 Requires: php-symfony4-yaml >= 4.1 -Requires: php-twig2 >= 2.4 +Requires: php-twig2 >= 2.9 Requires: php-williamdes-mariadb-mysql-kbs >= 1.2 %endif # Autoloader @@ -245,7 +245,10 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; '%{_datadir}/php/PhpMyAdmin/ShapeFile/autoload.php', '%{_datadir}/php/phpseclib/autoload.php', '%{_datadir}/php/ReCaptcha/autoload.php', - '%{_datadir}/php/Twig2/autoload.php', + [ + '%{_datadir}/php/Twig3/autoload.php', + '%{_datadir}/php/Twig2/autoload.php', + ], '%{_datadir}/php/PhpMyAdmin/Twig/Extensions/autoload.php', '%{_datadir}/php/Symfony4/Component/Config/autoload.php', '%{_datadir}/php/Symfony4/Component/DependencyInjection/autoload.php', @@ -328,7 +331,7 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \ %files %{!?_licensedir:%global license %%doc} %license LICENSE* -%doc ChangeLog README CONTRIBUTING.md DCO config.sample.inc.php +%doc ChangeLog README CONTRIBUTING.md config.sample.inc.php %doc doc/html/ %doc examples/ %doc composer.json @@ -347,6 +350,11 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \ %changelog +* Sat Oct 10 2020 Remi Collet <remi@remirepo.net> - 5.0.3-1 +- update to 5.0.3 +- raise dependency on twig 2.9 and allow v3 +- allow phpmyadmin/twig-i18n-extension v3 + * Sat Apr 4 2020 Remi Collet <remi@remirepo.net> 5.0.2-3 - temporarily make nginx-filesystem optional to allow installation with nginx from nginx repository |