diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | composer.spec | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/composer.json b/composer.json index 30d9f91..74030a4 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", "composer/ca-bundle": "^1.0", "composer/semver": "^1.0", - "composer/spdx-licenses": "^1.0", + "composer/spdx-licenses": "^1.2", "seld/jsonlint": "^1.4", "symfony/console": "^2.7 || ^3.0 || ^4.0", "symfony/finder": "^2.7 || ^3.0 || ^4.0", diff --git a/composer.spec b/composer.spec index 8ff96ee..a8a63bf 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 87f845d1c14aa22819c51b367ad7e07823f2e2ec +%global gh_commit 9445e12fb3b3db0c4aaeb8e492dd90c2a42b493c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -14,7 +14,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.1.0 -%global upstream_version 1.6.0 +%global upstream_version 1.6.1 #global upstream_prever RC %if 0%{?fedora} >= 27 @@ -25,7 +25,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP Group: Development/Libraries @@ -82,7 +82,7 @@ BuildRequires: php-PsrLog >= 1.0.0-8 # "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", # "composer/ca-bundle": "^1.0", # "composer/semver": "^1.0", -# "composer/spdx-licenses": "^1.0", +# "composer/spdx-licenses": "^1.2", # "seld/jsonlint": "~1.4", # "symfony/console": "^2.7 || ^3.0 || ^4.0", # "symfony/finder": "^2.7 || ^3.0 || ^4.0", @@ -94,7 +94,6 @@ BuildRequires: php-PsrLog >= 1.0.0-8 Requires: php(language) >= 5.3.2 Requires: php-cli Requires: php-justinrainbow-json-schema5 -# See https://github.com/composer/composer/pull/6974 Requires: php-composer(composer/spdx-licenses) >= 1.2 Requires: php-composer(composer/spdx-licenses) < 2 Requires: php-composer(composer/ca-bundle) >= 1.0 @@ -265,6 +264,9 @@ exit $ret %changelog +* Thu Jan 4 2018 Remi Collet <remi@remirepo.net> - 1.6.1-1 +- Update to 1.6.1 + * Thu Jan 4 2018 Remi Collet <remi@remirepo.net> - 1.6.0-2 - open https://github.com/composer/composer/pull/6974 Fix dependency on composer/spdx-licenses |