summaryrefslogtreecommitdiffstats
path: root/composer.spec
diff options
context:
space:
mode:
Diffstat (limited to 'composer.spec')
-rw-r--r--composer.spec57
1 files changed, 31 insertions, 26 deletions
diff --git a/composer.spec b/composer.spec
index 5c1611f..7ca69f6 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit b184a92419cc9a9c4c6a09db555a94d441cb11c9
+%global gh_commit 3ac3cf82e4aaf6ef560d3faa2bf54e0ff92fb71a
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_branch 1.0-dev
%global gh_owner composer
@@ -18,8 +18,8 @@
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
%global api_version 1.1.0
-%global upstream_version 1.6.5
-#global upstream_prever RC
+%global upstream_version 1.7.0
+%global upstream_prever RC
%if 0
# see https://forum.remirepo.net/viewtopic.php?id=3677
@@ -53,26 +53,26 @@ BuildRequires: php-cli
%if %{with_tests}
BuildRequires: php-justinrainbow-json-schema5
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-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(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2)
+BuildRequires: (php-composer(composer/xdebug-handler) >= 1.1 with php-composer(composer/xdebug-handler) < 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
BuildRequires: php-composer(composer/ca-bundle) >= 1.0
BuildRequires: php-composer(composer/semver) < 2
BuildRequires: php-composer(composer/semver) >= 1.0
+BuildRequires: php-composer(composer/spdx-licenses) < 2
+BuildRequires: php-composer(composer/spdx-licenses) >= 1.2
+BuildRequires: php-composer(composer/xdebug-handler) >= 1.1
+BuildRequires: php-composer(composer/xdebug-handler) < 2
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
%endif
@@ -88,48 +88,47 @@ BuildRequires: php-composer(phpunit/phpunit) >= 4.8.35
# For autoloader
BuildRequires: php-composer(fedora/autoloader) >= 0.1.2
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
# From composer.json, "require": {
# "php": "^5.3.2 || ^7.0",
-# "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
# "composer/ca-bundle": "^1.0",
# "composer/semver": "^1.0",
# "composer/spdx-licenses": "^1.2",
+# "composer/xdebug-handler": "^1.1",
+# "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
+# "psr/log": "^1.0"
# "seld/jsonlint": "~1.4",
+# "seld/phar-utils": "^1.0",
# "symfony/console": "^2.7 || ^3.0 || ^4.0",
+# "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
# "symfony/finder": "^2.7 || ^3.0 || ^4.0",
# "symfony/process": "^2.7 || ^3.0 || ^4.0",
-# "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
-# "seld/phar-utils": "^1.0",
-# "seld/cli-prompt": "^1.0",
-# "psr/log": "^1.0"
Requires: php(language) >= 5.3.2
Requires: php-cli
Requires: php-justinrainbow-json-schema5
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-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(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2)
+Requires: (php-composer(composer/xdebug-handler) >= 1.1 with php-composer(composer/xdebug-handler) < 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
Requires: php-composer(composer/ca-bundle) < 2
Requires: php-composer(composer/semver) >= 1.0
Requires: php-composer(composer/semver) < 2
+Requires: php-composer(composer/spdx-licenses) >= 1.2
+Requires: php-composer(composer/spdx-licenses) < 2
+Requires: php-composer(composer/xdebug-handler) >= 1.1
+Requires: php-composer(composer/xdebug-handler) < 2
Requires: php-composer(seld/jsonlint) >= 1.4
Requires: php-composer(seld/jsonlint) < 2
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
%endif
@@ -138,14 +137,15 @@ Requires: %{symfony_prefix}-finder
Requires: %{symfony_prefix}-process
Requires: %{symfony_prefix}-filesystem
# 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"
-Requires: php-zip
+# "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
+# "ext-zip": "Enabling the zip extension allows you to unzip archives",
+# "ext-zlib": "Allow gzip compression of HTTP requests"
Requires: php-openssl
+Requires: php-zip
+Requires: php-zlib
# For our autoloader
Requires: php-composer(fedora/autoloader)
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
@@ -264,7 +264,7 @@ export BUILDROOT=%{buildroot}
# testIntegration may hang on local build
ret=0
-for cmd in php php70 php71 php72; do
+for cmd in php php70 php71 php72 php73; do
if which $cmd; then
$cmd -d memory_limit=1G %{_bindir}/phpunit \
--filter '^((?!(testIntegration)).)*$' \
@@ -289,6 +289,11 @@ exit $ret
%changelog
+* Thu Jul 26 2018 Remi Collet <remi@remirepo.net> - 1.7.0-1
+- update to 1.7.0
+- drop dependency on seld/cli-prompt
+- add dependncy on composer/xdebug-handler
+
* Fri May 4 2018 Remi Collet <remi@remirepo.net> - 1.6.5-1
- update to 1.6.5