diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | composer.spec | 37 |
2 files changed, 20 insertions, 19 deletions
diff --git a/composer.json b/composer.json index 7705678..034824e 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "composer/semver": "^3.0", "composer/spdx-licenses": "^1.2", "composer/xdebug-handler": "^2.0", - "justinrainbow/json-schema": "^5.2.10", + "justinrainbow/json-schema": "^5.2.11", "psr/log": "^1.0", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.0", diff --git a/composer.spec b/composer.spec index 60e4edc..3204e03 100644 --- a/composer.spec +++ b/composer.spec @@ -10,30 +10,23 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit fc5c4573aafce3a018eb7f1f8f91cea423970f2e +%bcond_without tests + +%global gh_commit 5701b38ec6c66dd143658e6aa18e1808d2d5dc4b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer %global gh_project composer -%global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.3 +%global upstream_version 2.1.4 #global upstream_prever RC1 #global upstream_lower rc1 -# remirepo:1 -%if 0%{?fedora} >= 32 || 0%{?rhel} >= 8 %global symfony_prefix php-symfony4 %global symfony_path %{_datadir}/php/Symfony4 %global symfony_min 4.4 -# remirepo:5 -%else -%global symfony_prefix php-symfony3 -%global symfony_path %{_datadir}/php/Symfony3 -%global symfony_min 3.4.35 -%endif %global _phpunit %{_bindir}/phpunit9 @@ -58,7 +51,8 @@ Patch1: %{name}-noxdg.patch BuildArch: noarch BuildRequires: php-cli -%if %{with_tests} +%if %{with tests} +# remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) BuildRequires: (php-composer(composer/metadata-minifier) >= 1.0 with php-composer(composer/metadata-minifier) < 2) @@ -68,8 +62,9 @@ BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0 with php-com BuildRequires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) BuildRequires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) -BuildRequires: (php-composer(justinrainbow/json-schema) >= 5.2.10 with php-composer(justinrainbow/json-schema) < 6) +BuildRequires: (php-composer(justinrainbow/json-schema) >= 5.2.11 with php-composer(justinrainbow/json-schema) < 6) BuildRequires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) +# remirepo:12 %else BuildRequires: php-composer-ca-bundle BuildRequires: php-composer-metadata-minifier @@ -79,7 +74,7 @@ BuildRequires: php-composer-xdebug-handler2 BuildRequires: php-jsonlint >= 1.4 BuildRequires: php-seld-phar-utils BuildRequires: php-PsrLog -BuildRequires: php-justinrainbow-json-schema5 >= 5.2.10 +BuildRequires: php-justinrainbow-json-schema5 >= 5.2.11 BuildRequires: php-react-promise >= 2.7 %endif BuildRequires: %{symfony_prefix}-console >= %{symfony_min} @@ -104,7 +99,7 @@ BuildRequires: php-PsrLog >= 1.1 # "composer/semver": "^3.0", # "composer/spdx-licenses": "^1.2", # "composer/xdebug-handler": "^2.0", -# "justinrainbow/json-schema": "^5.2.10", +# "justinrainbow/json-schema": "^5.2.11", # "psr/log": "^1.0" # "seld/jsonlint": "~1.4", # "seld/phar-utils": "^1.0", @@ -115,6 +110,7 @@ BuildRequires: php-PsrLog >= 1.1 # "react/promise": "^1.2 || ^2.7" Requires: php(language) >= 5.3.2 Requires: php-cli +# remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) Requires: (php-composer(composer/metadata-minifier) >= 1.0 with php-composer(composer/metadata-minifier) < 2) @@ -124,8 +120,9 @@ Requires: (php-composer(composer/xdebug-handler) >= 2.0 with php-com Requires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) Requires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) -Requires: (php-composer(justinrainbow/json-schema) >= 5.2.10 with php-composer(justinrainbow/json-schema) < 6) +Requires: (php-composer(justinrainbow/json-schema) >= 5.2.11 with php-composer(justinrainbow/json-schema) < 6) Requires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) +# remirepo:12 %else Requires: php-composer-ca-bundle Requires: php-composer-metadata-minifier @@ -135,7 +132,7 @@ Requires: php-composer-xdebug-handler2 Requires: php-jsonlint >= 1.4 Requires: php-seld-phar-utils Requires: php-PsrLog -Requires: php-justinrainbow-json-schema5 >= 5.2.10 +Requires: php-justinrainbow-json-schema5 >= 5.2.11 Requires: php-react-promise >= 2.7 %endif Requires: %{symfony_prefix}-console >= %{symfony_min} @@ -282,7 +279,7 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %check -%if %{with_tests} +%if %{with tests} : Online tests rm tests/Composer/Test/Util/RemoteFilesystemTest.php @@ -330,6 +327,10 @@ exit $ret %changelog +* Thu Jul 22 2021 Remi Collet <remi@remirepo.net> - 2.1.4-1 +- update to 2.1.4 +- raise dependency on justinrainbow/json-schema 5.2.11 + * Thu Jun 10 2021 Remi Collet <remi@remirepo.net> - 2.1.3-1 - update to 2.1.3 |