summaryrefslogtreecommitdiffstats
path: root/composer.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-01-04 14:29:13 +0100
committerRemi Collet <remi@remirepo.net>2018-01-04 14:29:13 +0100
commit3bf1bef6e47438d6188645911de92a0751cf87b6 (patch)
tree1891da88181eb0444ef455162f3769468b6dd3e4 /composer.spec
parent471a55a8025dab1ff817f31bb575eafce0bb8e9c (diff)
open https://github.com/composer/composer/pull/6974: Fix dependency on composer/spdx-licenses
raise dependency on composer/spdx-licenses 1.2 switch to Symfony 3 on F27+
Diffstat (limited to 'composer.spec')
-rw-r--r--composer.spec15
1 files changed, 11 insertions, 4 deletions
diff --git a/composer.spec b/composer.spec
index 0ddbc8d..8ff96ee 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,14 +18,14 @@
#global upstream_prever RC
%if 0%{?fedora} >= 27
-%global symfony_prefix php-symfony4
+%global symfony_prefix php-symfony3
%else
%global symfony_prefix php-symfony
%endif
Name: composer
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Dependency Manager for PHP
Group: Development/Libraries
@@ -48,7 +48,7 @@ BuildRequires: php-cli
%if %{with_tests}
BuildRequires: php-justinrainbow-json-schema5
BuildRequires: php-composer(composer/spdx-licenses) < 2
-BuildRequires: php-composer(composer/spdx-licenses) >= 1.0
+BuildRequires: php-composer(composer/spdx-licenses) >= 1.2
BuildRequires: php-composer(composer/ca-bundle) < 2
BuildRequires: php-composer(composer/ca-bundle) >= 1.0
BuildRequires: php-composer(composer/semver) < 2
@@ -94,7 +94,8 @@ BuildRequires: php-PsrLog >= 1.0.0-8
Requires: php(language) >= 5.3.2
Requires: php-cli
Requires: php-justinrainbow-json-schema5
-Requires: php-composer(composer/spdx-licenses) >= 1.0
+# 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
Requires: php-composer(composer/ca-bundle) < 2
@@ -264,6 +265,12 @@ exit $ret
%changelog
+* 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
+- raise dependency on composer/spdx-licenses 1.2
+- switch to Symfony 3 on F27+
+
* Thu Jan 4 2018 Remi Collet <remi@remirepo.net> - 1.6.0-1
- Update to 1.6.0