diff options
| -rw-r--r-- | composer.json | 8 | ||||
| -rw-r--r-- | composer.spec | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/composer.json b/composer.json index f457758..10fc4f8 100644 --- a/composer.json +++ b/composer.json @@ -24,15 +24,17 @@ "require": { "php": "^5.3.2 || ^7.0", "justinrainbow/json-schema": "^1.6", - "composer/spdx-licenses": "^1.0", + "composer/ca-bundle": "^1.0", "composer/semver": "^1.0", + "composer/spdx-licenses": "^1.0", "seld/jsonlint": "^1.4", "symfony/console": "^2.5 || ^3.0", "symfony/finder": "^2.2 || ^3.0", "symfony/process": "^2.1 || ^3.0", "symfony/filesystem": "^2.5 || ^3.0", "seld/phar-utils": "^1.0", - "seld/cli-prompt": "^1.0" + "seld/cli-prompt": "^1.0", + "psr/log": "^1.0" }, "require-dev": { "phpunit/phpunit": "^4.5 || ^5.0.5", @@ -58,7 +60,7 @@ "bin": ["bin/composer"], "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "scripts": { diff --git a/composer.spec b/composer.spec index 26c7799..492844d 100644 --- a/composer.spec +++ b/composer.spec @@ -6,18 +6,18 @@ # # Please, preserve the changelog entries # -%global gh_commit 94c2a21fe51016758212fa0aebd8add36757f354 +%global gh_commit 2eab5e81fc983cfd262d6a728aa48fca833f1c74 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer %global gh_project composer %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.1.0 -%global prever RC +#global prever RC Name: composer Version: 1.1.0 -Release: 0.1.%{prever}%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP Group: Development/Libraries @@ -240,6 +240,9 @@ rm -rf %{buildroot} %changelog +* Wed May 11 2016 Remi Collet <remi@fedoraproject.org> - 1.1.0-1 +- update to 1.1.0 + * Sat Apr 30 2016 Remi Collet <remi@fedoraproject.org> - 1.1.0-0.1.RC - update to 1.1.0-RC - add dependency on composer/ca-bundle |