From 9e7396487cb65e05296045d69a949ac0a0300576 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 30 Apr 2016 10:29:39 +0200 Subject: composer: 1.0.3 and 1.1.0-RC --- composer.spec | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) (limited to 'composer.spec') diff --git a/composer.spec b/composer.spec index 354013c..ed67bd7 100644 --- a/composer.spec +++ b/composer.spec @@ -6,23 +6,24 @@ # # Please, preserve the changelog entries # -%global gh_commit a083aa5e0c9b8ad989c622638aa380c1f88a68ec +%global gh_commit 94c2a21fe51016758212fa0aebd8add36757f354 %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.0.0 +%global api_version 1.1.0 +%global prever RC Name: composer -Version: 1.0.2 -Release: 1%{?dist} +Version: 1.1.0 +Release: 0.1.%{prever}%{?dist} Summary: Dependency Manager for PHP Group: Development/Libraries License: MIT URL: https://getcomposer.org/ -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz +Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz Source1: %{name}-autoload.php Source2: %{name}-bootstrap.php @@ -35,10 +36,12 @@ BuildRequires: php-cli %if %{with_tests} BuildRequires: php-composer(justinrainbow/json-schema) >= 1.6 BuildRequires: php-composer(composer/spdx-licenses) >= 1.0 +BuildRequires: php-composer(composer/ca-bundle) >= 1.0 BuildRequires: php-composer(composer/semver) >= 1.0 BuildRequires: php-composer(seld/jsonlint) >= 1.4 BuildRequires: php-composer(seld/phar-utils) >= 1.0 BuildRequires: php-composer(seld/cli-prompt) >= 1.0 +BuildRequires: php-composer(psr/log) >= 1.0 BuildRequires: php-composer(symfony/console) >= 2.5 BuildRequires: php-composer(symfony/finder) >= 2.2 BuildRequires: php-composer(symfony/filesystem) >= 2.5 @@ -52,6 +55,7 @@ BuildRequires: php-composer(phpunit/phpunit) >= 4.5 BuildRequires: php-composer(symfony/class-loader) BuildRequires: php-seld-phar-utils >= 1.0.1 BuildRequires: php-seld-cli-prompt >= 1.0.0-3 +BuildRequires: php-PsrLog >= 1.0.0-8 %endif # ca-certificates @@ -60,21 +64,25 @@ Requires: %{_sysconfdir}/pki/tls/certs/ca-bundle.crt # From composer.json, "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" Requires: php(language) >= 5.3.2 Requires: php-cli Requires: php-composer(justinrainbow/json-schema) >= 1.6 Requires: php-composer(justinrainbow/json-schema) < 2 Requires: php-composer(composer/spdx-licenses) >= 1.0 Requires: php-composer(composer/spdx-licenses) < 2 +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(seld/jsonlint) >= 1.4 @@ -83,6 +91,8 @@ Requires: php-composer(seld/phar-utils) >= 1.0 Requires: php-composer(seld/phar-utils) < 2 Requires: php-composer(seld/cli-prompt) >= 1.0 Requires: php-composer(seld/cli-prompt) < 2 +Requires: php-composer(psr/log) >= 1.0 +Requires: php-composer(psr/log) < 2 Requires: php-composer(symfony/console) >= 2.5 Requires: php-composer(symfony/console) < 4 Requires: php-composer(symfony/finder) >= 2.2 @@ -100,6 +110,7 @@ Requires: php-openssl Requires: php-composer(symfony/class-loader) Requires: php-seld-phar-utils >= 1.0.1 Requires: php-seld-cli-prompt >= 1.0.0-3 +Requires: php-PsrLog >= 1.0.0-8 # From phpcompatinfo Requires: php-curl Requires: php-date @@ -198,6 +209,8 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %if 0%{?rhel} == 5 rm tests/Composer/Test/Downloader/XzDownloaderTest.php %endif +sed -e 's/testDispatcherCanConvertScriptEventToCommandEventForListener/SKIP1/' \ + -i tests/Composer/Test/EventDispatcher/EventDispatcherTest.php : Ensure not used rm -rf res @@ -230,6 +243,15 @@ rm -rf %{buildroot} %changelog +* Sat Apr 30 2016 Remi Collet - 1.1.0-0.1.RC +- update to 1.1.0-RC +- add dependency on composer/ca-bundle +- add dependency on psr/log +- bump composer-plugin-api to 1.1.0 + +* Sat Apr 30 2016 Remi Collet - 1.0.3-1 +- update to 1.0.3 + * Thu Apr 21 2016 Remi Collet - 1.0.2-1 - update to 1.0.2 -- cgit