summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-02-01 06:06:31 +0100
committerRemi Collet <remi@remirepo.net>2018-02-01 06:06:31 +0100
commitaff6105c62a6526dd00d5425467105978d68df16 (patch)
tree45aef9cd87ade6be544fb7ac70f0ca66a081c763
parentf85c6d243f56fb186395a9aac175dd11211e3834 (diff)
v1.6.3
-rw-r--r--composer.spec29
1 files changed, 26 insertions, 3 deletions
diff --git a/composer.spec b/composer.spec
index 95bc1e9..283b470 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,12 +1,12 @@
# remirepo/fedora spec file for composer
#
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2018 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
-%global gh_commit db191abd24b0be110c98ba2271ca992e1c70962f
+%global gh_commit 88a69fda0f2187ad8714cedffd7a8872dceaa4c2
%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.2
+%global upstream_version 1.6.3
#global upstream_prever RC
%if 0%{?fedora} >= 27
@@ -47,6 +47,15 @@ BuildArch: noarch
BuildRequires: php-cli
%if %{with_tests}
BuildRequires: php-justinrainbow-json-schema5
+%if 0%{?fedora} >= 27
+BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2)
+BuildRequires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2)
+BuildRequires: (php-composer(composer/semver) >= 1.0 with php-composer(composer/semver) < 2)
+BuildRequires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2)
+BuildRequires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2)
+BuildRequires: (php-composer(seld/cli-prompt) >= 1.0 with php-composer(seld/cli-prompt) < 2)
+BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2)
+%else
BuildRequires: php-composer(composer/spdx-licenses) < 2
BuildRequires: php-composer(composer/spdx-licenses) >= 1.2
BuildRequires: php-composer(composer/ca-bundle) < 2
@@ -61,6 +70,7 @@ 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
+%endif
BuildRequires: %{symfony_prefix}-console
BuildRequires: %{symfony_prefix}-finder
BuildRequires: %{symfony_prefix}-filesystem
@@ -94,6 +104,15 @@ BuildRequires: php-PsrLog >= 1.0.0-8
Requires: php(language) >= 5.3.2
Requires: php-cli
Requires: php-justinrainbow-json-schema5
+%if 0%{?fedora} >= 27
+Requires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2)
+Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2)
+Requires: (php-composer(composer/semver) >= 1.0 with php-composer(composer/semver) < 2)
+Requires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2)
+Requires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2)
+Requires: (php-composer(seld/cli-prompt) >= 1.0 with php-composer(seld/cli-prompt) < 2)
+Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2)
+%else
Requires: php-composer(composer/spdx-licenses) >= 1.2
Requires: php-composer(composer/spdx-licenses) < 2
Requires: php-composer(composer/ca-bundle) >= 1.0
@@ -108,6 +127,7 @@ 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
+%endif
Requires: %{symfony_prefix}-console
Requires: %{symfony_prefix}-finder
Requires: %{symfony_prefix}-process
@@ -264,6 +284,9 @@ exit $ret
%changelog
+* Thu Feb 1 2018 Remi Collet <remi@remirepo.net> - 1.6.3-1
+- Update to 1.6.3
+
* Sun Jan 7 2018 Remi Collet <remi@remirepo.net> - 1.6.2-1
- Update to 1.6.2