X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=composer.spec;h=a3b4bb62838bf545053c3b671c36363df71b9c46;hb=HEAD;hp=319b57e578b00979e8934643cc164df162d71651;hpb=4f09c14feb856881e1acae762ea5cee8e2200b39;p=packages%2Fcomposer.git

diff --git a/composer.spec b/composer.spec
index 319b57e..a3b4bb6 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,17 +1,21 @@
 #
 # Conditional build:
 %bcond_with	tests		# build with tests
+%bcond_without	online		# online self-test
+
+%if 0%{?_pld_builder:1}
+%undefine	with_online
+%endif
 
 %define		php_min_version 5.3.4
-%include	/usr/lib/rpm/macros.php
 Summary:	Dependency Manager for PHP
 Name:		composer
-Version:	1.6.5
+Version:	1.10.26
 Release:	1
 License:	MIT
 Group:		Development/Languages/PHP
 Source0:	https://github.com/composer/composer/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	2feed0f843c82f863710f31539913a25
+# Source0-md5:	170c36246e52522e17540a6aaee57d8c
 Source2:	https://raw.githubusercontent.com/iArren/%{name}-bash-completion/86a8129/composer
 # Source2-md5:	cdeebf0a0da1fd07d0fd886d0461642e
 Source3:	autoload.php
@@ -22,10 +26,11 @@ URL:		https://getcomposer.org/
 BuildRequires:	php-devel
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 BuildRequires:	rpmbuild(macros) >= 1.673
-%if %{with tests}
 # instead of filling duplicate deps for running tests,
 # update composer version that have neccessary runtime dependencies
-BuildRequires:	composer >= 1.4.0
+BuildRequires:	composer >= 1.7.0
+%{?with_online:BuildRequires:	%{php_name}-cli}
+%if %{with tests}
 BuildRequires:	git-core
 BuildRequires:	phpab
 BuildRequires:	phpunit >= 4.8
@@ -48,15 +53,17 @@ Requires:	php(zlib)
 Requires:	php-composer-ca-bundle >= 1.0.2
 Requires:	php-composer-semver >= 1.0.0
 Requires:	php-composer-spdx-licenses >= 1.2
+Requires:	php-composer-xdebug-handler >= 1.1
 Requires:	php-justinrainbow-json-schema >= 3.0
-Requires:	php-psr-Log >= 1.0
-Requires:	php-seld-cli-prompt >= 1.0.0
+Requires:	php-psr-log >= 1.0
 Requires:	php-seld-jsonlint >= 1.4
 Requires:	php-seld-phar-utils >= 1.0.0
 Requires:	php-symfony2-ClassLoader >= 2.7.7
 Requires:	php-symfony2-Console >= 2.7.7
+Requires:	php-symfony2-Filesystem >= 2.7.7
 Requires:	php-symfony2-Finder >= 2.7.7
 Requires:	php-symfony2-Process >= 2.7.7
+Requires:	unzip
 Suggests:	bash-completion-%{name}
 Suggests:	git-core
 Suggests:	mercurial
@@ -107,6 +114,11 @@ ln -s src/Composer/res
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %build
+%if %{with online}
+# always run self-test
+%{__php} ./bin/composer diagnose
+%endif
+
 %if %{with tests}
 phpab -n -o src/bootstrap.php -e '*/Fixtures/*' src/ tests/
 echo "require 'src/Composer/autoload.php';" >> src/bootstrap.php