diff options
Diffstat (limited to 'composer.spec')
| -rw-r--r-- | composer.spec | 75 |
1 files changed, 37 insertions, 38 deletions
diff --git a/composer.spec b/composer.spec index 0f66b50..1c36b02 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd +%global gh_commit 489e09ee6c3ba431fbeeef9147afdaeb6f91b647 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.4.1 +Version: 1.4.2 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -33,22 +33,35 @@ Source4: %{name}.csh # Use our autoloader, resources path, fix for tests Patch0: %{name}-rpm.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Sticked to json-schema 4 and Symfony 2.8 because of +# https://github.com/composer/composer/issues/6434 + BuildArch: noarch BuildRequires: php-cli %if %{with_tests} -BuildRequires: php-composer(justinrainbow/json-schema) >= 3.0 +BuildRequires: php-justinrainbow-json-schema4 +BuildRequires: php-composer(composer/spdx-licenses) < 2 BuildRequires: php-composer(composer/spdx-licenses) >= 1.0 +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(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(seld/cli-prompt) < 2 BuildRequires: php-composer(seld/cli-prompt) >= 1.0 +BuildRequires: php-composer(psr/log) < 2 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 -BuildRequires: php-composer(symfony/process) >= 2.1 +BuildRequires: php-composer(symfony/console) < 3 +BuildRequires: php-composer(symfony/console) >= 2.7 +BuildRequires: php-composer(symfony/finder) < 3 +BuildRequires: php-composer(symfony/finder) >= 2.7 +BuildRequires: php-composer(symfony/filesystem) < 3 +BuildRequires: php-composer(symfony/filesystem) >= 2.7 +BuildRequires: php-composer(symfony/process) < 3 +BuildRequires: php-composer(symfony/process) >= 2.7 BuildRequires: php-zip # From composer.json, "require-dev": { # "phpunit/phpunit": "^4.5 || ^5.0.5", @@ -77,8 +90,7 @@ BuildRequires: php-PsrLog >= 1.0.0-8 # "psr/log": "^1.0" Requires: php(language) >= 5.3.2 Requires: php-cli -Requires: php-composer(justinrainbow/json-schema) >= 3.0 -Requires: php-composer(justinrainbow/json-schema) < 6 +Requires: php-justinrainbow-json-schema4 Requires: php-composer(composer/spdx-licenses) >= 1.0 Requires: php-composer(composer/spdx-licenses) < 2 Requires: php-composer(composer/ca-bundle) >= 1.0 @@ -94,13 +106,13 @@ 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.7 -Requires: php-composer(symfony/console) < 4 +Requires: php-composer(symfony/console) < 3 Requires: php-composer(symfony/finder) >= 2.7 -Requires: php-composer(symfony/finder) < 4 +Requires: php-composer(symfony/finder) < 3 Requires: php-composer(symfony/process) >= 2.7 -Requires: php-composer(symfony/process) < 4 +Requires: php-composer(symfony/process) < 3 Requires: php-composer(symfony/filesystem) >= 2.7 -Requires: php-composer(symfony/filesystem) < 4 +Requires: php-composer(symfony/filesystem) < 3 # From composer.json, suggest # "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic", # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages" @@ -187,8 +199,6 @@ if (version_compare(PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) { %install -rm -rf %{buildroot} - : Profile scripts mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/ @@ -210,48 +220,32 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %check %if %{with_tests} -# remirepo:4 -%if 0%{?rhel} == 5 -rm tests/Composer/Test/Downloader/XzDownloaderTest.php -%endif -if [ "$(whoami)" != "remi" ]; then : Online tests rm tests/Composer/Test/Util/RemoteFilesystemTest.php -# remirepo:1 -fi : Ensure not used rm -rf res : Run test suite export BUILDROOT=%{buildroot} -# remirepo:11 -run=0 + ret=0 -if which php56; then - php56 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php || ret=1 - run=1 -fi +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose || ret=1 + fi +done if which php71; then php71 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php || ret=1 run=1 fi -if [ $run -eq 0 ]; then -%{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose -# remirepo:2 -fi exit $ret %else : Test suite disabled %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md doc @@ -263,6 +257,11 @@ rm -rf %{buildroot} %changelog +* Mon May 22 2017 Remi Collet <remi@remirepo.net> - 1.4.2-1 +- Update to 1.4.2 +- only use json-schema 4 and Symfony 2.8 because of + https://github.com/composer/composer/issues/6434 + * Fri Mar 10 2017 Remi Collet <remi@remirepo.net> - 1.4.1-1 - Update to 1.4.1 |