diff options
| -rw-r--r-- | composer.json | 6 | ||||
| -rw-r--r-- | phpMyAdmin.spec | 18 |
2 files changed, 14 insertions, 10 deletions
diff --git a/composer.json b/composer.json index 6ef2747..bfe6968 100644 --- a/composer.json +++ b/composer.json @@ -49,6 +49,7 @@ "phpmyadmin/motranslator": "^4.0", "phpmyadmin/shapefile": "^2.0", "phpmyadmin/sql-parser": "^5.0", + "phpmyadmin/twig-i18n-extension": "^2.0", "phpseclib/phpseclib": "^2.0", "symfony/config": "^4.2.8", "symfony/dependency-injection": "^4.2.8", @@ -56,7 +57,6 @@ "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-mbstring": "^1.3", "symfony/yaml": "^4.2.8", - "twig/extensions": "~1.5.1", "twig/twig": "^2.4", "williamdes/mariadb-mysql-kbs": "^1.2" }, @@ -82,10 +82,10 @@ }, "require-dev": { "codacy/coverage": "^1.3.0", - "facebook/webdriver": "^1.7.1", + "php-webdriver/webdriver": "^1.7.1", "phpmyadmin/coding-standard": "^1.0", "phpstan/phpstan": "^0.11.5", - "phpunit/phpunit": "^7.5 || ^8.0", + "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0", "pragmarx/google2fa-qrcode": "^1.0.1", "samyoul/u2f-php-server": "^1.1", "squizlabs/php_codesniffer": "^3.0", diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 40eb163..3b1c9d0 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -22,12 +22,12 @@ %global with_httpd 0 %endif -%global upstream_version 5.0.1 +%global upstream_version 5.0.2 #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/) @@ -69,6 +69,7 @@ Suggests: httpd # "phpmyadmin/motranslator": "^4.0", # "phpmyadmin/shapefile": "^2.0", # "phpmyadmin/sql-parser": "^5.0", +# "phpmyadmin/twig-i18n-extension": "^2.0", # "phpseclib/phpseclib": "^2.0", # "symfony/config": "^4.2.8", # "symfony/dependency-injection": "^4.2.8", @@ -76,7 +77,6 @@ Suggests: httpd # "symfony/polyfill-ctype": "^1.8", # "symfony/polyfill-mbstring": "^1.3", # "symfony/yaml": "^4.2.8", -# "twig/extensions": "~1.5.1", # "twig/twig": "^2.4", # "williamdes/mariadb-mysql-kbs": "^1.2" Requires: php(language) >= 7.1.3 @@ -92,6 +92,7 @@ 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(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) @@ -99,7 +100,6 @@ Requires: (php-composer(symfony/expression-language) >= 4.2.8 with php-compose 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/extensions) >= 1.5.1 with php-composer(twig/extensions) < 2) Requires: (php-composer(williamdes/mariadb-mysql-kbs) >= 1.2 with php-composer(williamdes/mariadb-mysql-kbs) < 2) # remirepo:15 %else @@ -107,6 +107,7 @@ Requires: php-google-recaptcha >= 1.1 Requires: php-phpmyadmin-motranslator >= 4.0 Requires: php-phpmyadmin-shapefile >= 2.0 Requires: php-phpmyadmin-sql-parser5 +Requires: php-phpmyadmin-twig-i18n-extension Requires: php-phpseclib >= 2.0.9 Requires: php-symfony4-config >= 4.1 Requires: php-symfony4-dependency-injection >= 4.1 @@ -114,7 +115,6 @@ 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-twig-extensions >= 1.5.1 Requires: php-williamdes-mariadb-mysql-kbs >= 1.2 %endif # Autoloader @@ -230,13 +230,13 @@ cat << 'EOF' | tee vendor/autoload.php require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('PhpMyAdmin\\', dirname(__DIR__) . '/libraries/classes'); \Fedora\Autoloader\Dependencies::required([ + '%{_datadir}/php/PhpMyAdmin/MoTranslator/autoload.php', /* before sqlparser which may allow other version */ '%{_datadir}/php/PhpMyAdmin/SqlParser5/autoload.php', - '%{_datadir}/php/PhpMyAdmin/MoTranslator/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/Twig/Extensions/autoload.php', + '%{_datadir}/php/PhpMyAdmin/Twig/Extensions/autoload.php', '%{_datadir}/php/Symfony4/Component/Config/autoload.php', '%{_datadir}/php/Symfony4/Component/DependencyInjection/autoload.php', '%{_datadir}/php/Symfony4/Component/ExpressionLanguage/autoload.php', @@ -330,6 +330,10 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \ %changelog +* Sat Mar 21 2020 Remi Collet <remi@remirepo.net> 5.0.2-1 +- update to 5.0.2 (2020-03-21, security release) +- use phpmyadmin/twig-i18n-extension instead of twig/extensions + * Sun Jan 19 2020 Remi Collet <remi@remirepo.net> 5.0.1-2 - add missing depependency on williamdes/mariadb-mysql-kbs |