diff options
| -rw-r--r-- | composer.json | 5 | ||||
| -rw-r--r-- | psysh.spec | 27 |
2 files changed, 13 insertions, 19 deletions
diff --git a/composer.json b/composer.json index a097b3d..95e6641 100644 --- a/composer.json +++ b/composer.json @@ -18,8 +18,7 @@ "ext-tokenizer": "*", "symfony/console": "~5.0|~4.0|~3.0|^2.4.2|~2.3.10", "symfony/var-dumper": "~5.0|~4.0|~3.0|~2.7", - "nikic/php-parser": "~4.0|~3.0|~2.0|~1.3", - "dnoegel/php-xdg-base-dir": "0.1.*" + "nikic/php-parser": "~4.0|~3.0|~2.0|~1.3" }, "require-dev": { "hoa/console": "3.17.*", @@ -46,7 +45,7 @@ "bin": ["bin/psysh"], "extra": { "branch-alias": { - "dev-master": "0.10.x-dev" + "dev-main": "0.10.x-dev" } } } @@ -2,7 +2,7 @@ # # Fedora spec file for psysh # -# Copyright (c) 2016-2020 Shawn Iwinski <shawn@iwin.ski> +# Copyright (c) 2016-2021 Shawn Iwinski <shawn@iwin.ski> # # License: MIT # http://opensource.org/licenses/MIT @@ -12,8 +12,8 @@ %global github_owner bobthecow %global github_name psysh -%global github_version 0.10.4 -%global github_commit a8aec1b2981ab66882a01cce36a49b6317dc3560 +%global github_version 0.10.8 +%global github_commit e4573f47750dd6c92dca5aee543fa77513cbd8d3 %global composer_vendor psy %global composer_project psysh @@ -26,9 +26,6 @@ # "php": "^8.0 || ^7.0 || ^5.5.9" %global php_min_ver 5.5.9 -# "dnoegel/php-xdg-base-dir": "0.1.*" -%global php_xdg_base_dir_min_ver 0.1 -%global php_xdg_base_dir_max_ver 0.2 # "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0" # NOTE: Forcing minimum version 4 %global php_parser_min_ver 4.0 @@ -77,15 +74,12 @@ BuildArch: noarch BuildRequires: php-cli ## composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(phpunit/phpunit) +BuildRequires: phpunit9 %if %{with_range_dependencies} -BuildRequires: (php-composer(dnoegel/php-xdg-base-dir) >= %{php_xdg_base_dir_min_ver} with php-composer(dnoegel/php-xdg-base-dir) < %{php_xdg_base_dir_max_ver}) BuildRequires: (php-composer(nikic/php-parser) >= %{php_parser_min_ver} with php-composer(nikic/php-parser) < %{php_parser_max_ver}) BuildRequires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver}) BuildRequires: (php-composer(symfony/var-dumper) >= %{symfony_min_ver} with php-composer(symfony/var-dumper) < %{symfony_max_ver}) %else -BuildRequires: php-composer(dnoegel/php-xdg-base-dir) < %{php_xdg_base_dir_max_ver} -BuildRequires: php-composer(dnoegel/php-xdg-base-dir) >= %{php_xdg_base_dir_min_ver} BuildRequires: php-composer(nikic/php-parser) < %{php_parser_max_ver} BuildRequires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} BuildRequires: php-symfony3-console @@ -113,13 +107,10 @@ Requires: php-cli # composer.json Requires: php(language) >= %{php_min_ver} %if %{with_range_dependencies} -Requires: (php-composer(dnoegel/php-xdg-base-dir) >= %{php_xdg_base_dir_min_ver} with php-composer(dnoegel/php-xdg-base-dir) < %{php_xdg_base_dir_max_ver}) Requires: (php-composer(nikic/php-parser) >= %{php_parser_min_ver} with php-composer(nikic/php-parser) < %{php_parser_max_ver}) Requires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver}) Requires: (php-composer(symfony/var-dumper) >= %{symfony_min_ver} with php-composer(symfony/var-dumper) < %{symfony_max_ver}) %else -Requires: php-composer(dnoegel/php-xdg-base-dir) < %{php_xdg_base_dir_max_ver} -Requires: php-composer(dnoegel/php-xdg-base-dir) >= %{php_xdg_base_dir_min_ver} Requires: php-composer(nikic/php-parser) < %{php_parser_max_ver} Requires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} Requires: php-symfony3-console @@ -175,7 +166,6 @@ require_once __DIR__.'/functions.php'; \Fedora\Autoloader\Dependencies::required([ '%{phpdir}/PhpParser4/autoload.php', - '%{phpdir}/XdgBaseDir/autoload.php', [ '%{phpdir}/Symfony5/Component/Console/autoload.php', '%{phpdir}/Symfony4/Component/Console/autoload.php', @@ -243,8 +233,8 @@ rm test/Readline/HoaConsoleTest.php : Upstream tests RETURN_CODE=0 -PHPUNIT=$(which phpunit) -for PHP_EXEC in "" %{?rhel:php54 php55 php56 php70 php71} php72 php73 php74; do +PHPUNIT=$(which phpunit9) +for PHP_EXEC in "" php73 php74 php80; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \ || RETURN_CODE=1 @@ -266,6 +256,11 @@ exit $RETURN_CODE %changelog +* Wed May 26 2021 Remi Collet <remi@remirepo.net> - 0.10.8-1 +- update to 0.10.8 +- drop dependency on dnoegel/php-xdg-base-dir +- switch to phpunit9 + * Sun Aug 16 2020 Shawn Iwinski <shawn@iwin.ski> - 0.10.4-1 - Update to 0.10.4 (RHBZ #1782258) - Fix FTBFS (RHBZ #1865260) |