diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | composer.spec | 25 |
2 files changed, 11 insertions, 16 deletions
diff --git a/composer.json b/composer.json index 024dc45..981f96a 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ } ], "require": { - "php": "^5.3.2 || ^7.0", + "php": "^5.3.2 || ^7.0 || ^8.0", "composer/ca-bundle": "^1.0", "composer/semver": "^3.0", "composer/spdx-licenses": "^1.2", diff --git a/composer.spec b/composer.spec index 3b12ae5..605e74c 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit fa90c099e9c402bcf83fa83d3276d160cf9986fe +%global gh_commit 89958bf29bb97351af6bff697ba6851de03e66f4 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,28 +20,19 @@ %global run_version 2.0.0 %global upstream_version 2.0.0 -%global upstream_prever alpha1 +%global upstream_prever alpha2 -%if 0%{?fedora} >= 32 || 0%{?rhel} >=8 -%global symfony_prefix php-symfony4 -%global symfony_path %{_datadir}/php/Symfony4 -%global symfony_min 4.4 -%global _phpunit %{_bindir}/phpunit7 -%else -# remirepo:1 -%if 0 %global symfony_prefix php-symfony %global symfony_path %{_datadir}/php/Symfony %global symfony_min 2.8 + +# remirepo:1 +%if 0 %global _phpunit %{_bindir}/phpunit -# remirepo:6 +# remirepo:3 %else -%global symfony_prefix php-symfony3 -%global symfony_path %{_datadir}/php/Symfony3 -%global symfony_min 3.4 %global _phpunit %{_bindir}/phpunit7 %endif -%endif Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} @@ -320,6 +311,10 @@ exit $ret %changelog +* Thu Jun 25 2020 Remi Collet <remi@remirepo.net> - 2.0.0~alpha2-1 +- update to 2.0.0-alpha2 +- switch back to Symfony 2 + * Wed Jun 3 2020 Remi Collet <remi@remirepo.net> - 2.0.0~alpha1-1 - update to 2.0.0-alpha1 - switch to Symfony 4 |