summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json2
-rw-r--r--composer.spec86
2 files changed, 40 insertions, 48 deletions
diff --git a/composer.json b/composer.json
index e588cb7..4fdbcb7 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
"composer/semver": "^1.0",
"composer/spdx-licenses": "^1.2",
"composer/xdebug-handler": "^1.1",
- "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
+ "justinrainbow/json-schema": "^5.2.10",
"psr/log": "^1.0",
"seld/jsonlint": "^1.4",
"seld/phar-utils": "^1.0",
diff --git a/composer.spec b/composer.spec
index 4f8bb64..4d788f6 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit be81b9c4735362c26876bdbfd3b5bc7e7f711c88
+%global gh_commit 956608ea4f7de9e58c53dfb019d85ae62b193c39
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_branch 1.0-dev
%global gh_owner composer
@@ -19,7 +19,7 @@
%global api_version 1.1.0
%global run_version 1.0.0
-%global upstream_version 1.10.6
+%global upstream_version 1.10.7
#global upstream_prever RC
%if 0
@@ -51,30 +51,24 @@ Patch0: %{name}-rpm.patch
BuildArch: noarch
BuildRequires: php-cli
%if %{with_tests}
-BuildRequires: php-justinrainbow-json-schema5
%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/semver) >= 1.0 with php-composer(composer/semver) < 2)
-BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2)
-BuildRequires: (php-composer(composer/xdebug-handler) >= 1.1 with php-composer(composer/xdebug-handler) < 2)
-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(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2)
+BuildRequires: (php-composer(composer/semver) >= 1.0 with php-composer(composer/semver) < 2)
+BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2)
+BuildRequires: (php-composer(composer/xdebug-handler) >= 1.1 with php-composer(composer/xdebug-handler) < 2)
+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)
%else
-BuildRequires: php-composer(composer/ca-bundle) < 2
-BuildRequires: php-composer(composer/ca-bundle) >= 1.0
-BuildRequires: php-composer(composer/semver) < 2
-BuildRequires: php-composer(composer/semver) >= 1.0
-BuildRequires: php-composer(composer/spdx-licenses) < 2
-BuildRequires: php-composer(composer/spdx-licenses) >= 1.2
-BuildRequires: php-composer(composer/xdebug-handler) >= 1.1
-BuildRequires: php-composer(composer/xdebug-handler) < 2
-BuildRequires: php-composer(seld/jsonlint) < 2
-BuildRequires: php-composer(seld/jsonlint) >= 1.4
-BuildRequires: php-composer(seld/phar-utils) < 2
-BuildRequires: php-composer(seld/phar-utils) >= 1.0
-BuildRequires: php-composer(psr/log) < 2
-BuildRequires: php-composer(psr/log) >= 1.0
+BuildRequires: php-composer-ca-bundle
+BuildRequires: php-composer-semver
+BuildRequires: php-composer-spdx-licenses >= 1.2
+BuildRequires: php-composer-xdebug-handler >= 1.1
+BuildRequires: php-jsonlint >= 1.4
+BuildRequires: php-seld-phar-utils
+BuildRequires: php-PsrLog
+BuildRequires: php-justinrainbow-json-schema5 >= 5.2.10
%endif
BuildRequires: %{symfony_prefix}-console
BuildRequires: %{symfony_prefix}-finder
@@ -97,7 +91,7 @@ BuildRequires: php-PsrLog >= 1.0.0-8
# "composer/semver": "^1.0",
# "composer/spdx-licenses": "^1.2",
# "composer/xdebug-handler": "^1.1",
-# "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
+# "justinrainbow/json-schema": "^5.2.10",
# "psr/log": "^1.0"
# "seld/jsonlint": "~1.4",
# "seld/phar-utils": "^1.0",
@@ -107,30 +101,24 @@ BuildRequires: php-PsrLog >= 1.0.0-8
# "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0",
Requires: php(language) >= 5.3.2
Requires: php-cli
-Requires: php-justinrainbow-json-schema5
%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/semver) >= 1.0 with php-composer(composer/semver) < 2)
-Requires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2)
-Requires: (php-composer(composer/xdebug-handler) >= 1.1 with php-composer(composer/xdebug-handler) < 2)
-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(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2)
+Requires: (php-composer(composer/semver) >= 1.0 with php-composer(composer/semver) < 2)
+Requires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2)
+Requires: (php-composer(composer/xdebug-handler) >= 1.1 with php-composer(composer/xdebug-handler) < 2)
+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)
%else
-Requires: php-composer(composer/ca-bundle) >= 1.0
-Requires: php-composer(composer/ca-bundle) < 2
-Requires: php-composer(composer/semver) >= 1.0
-Requires: php-composer(composer/semver) < 2
-Requires: php-composer(composer/spdx-licenses) >= 1.2
-Requires: php-composer(composer/spdx-licenses) < 2
-Requires: php-composer(composer/xdebug-handler) >= 1.1
-Requires: php-composer(composer/xdebug-handler) < 2
-Requires: php-composer(seld/jsonlint) >= 1.4
-Requires: php-composer(seld/jsonlint) < 2
-Requires: php-composer(seld/phar-utils) >= 1.0
-Requires: php-composer(seld/phar-utils) < 2
-Requires: php-composer(psr/log) >= 1.0
-Requires: php-composer(psr/log) < 2
+Requires: php-composer-ca-bundle
+Requires: php-composer-semver
+Requires: php-composer-spdx-licenses >= 1.2
+Requires: php-composer-xdebug-handler >= 1.1
+Requires: php-jsonlint >= 1.4
+Requires: php-seld-phar-utils
+Requires: php-PsrLog
+Requires: php-justinrainbow-json-schema5 >= 5.2.10
%endif
Requires: %{symfony_prefix}-console
Requires: %{symfony_prefix}-finder
@@ -289,6 +277,10 @@ exit $ret
%changelog
+* Wed Jun 3 2020 Remi Collet <remi@remirepo.net> - 1.10.7-1
+- update to 1.10.7
+- raise dependency on justinrainbow/json-schema 5.2.10
+
* Wed May 6 2020 Remi Collet <remi@remirepo.net> - 1.10.6-1
- update to 1.10.6
- provide php-composer(composer-runtime-api)