Requires cli for online test

[packages/composer.git] / composer.spec

diff --git a/composer.spec b/composer.spec
index d7a181f9de1e286e044d30cb9e5fcbfcaae37edb..a3b4bb62838bf545053c3b671c36363df71b9c46 100644 (file)
--- a/composer.spec
+++ b/composer.spec
@@ -1,41 +1,39 @@
 #
 # Conditional build:
-%bcond_without tests           # build with tests
+%bcond_with    tests           # build with tests
+%bcond_without online          # online self-test
 
-# NOTE
-# - release tarballs: http://getcomposer.org/download/
+%if 0%{?_pld_builder:1}
+%undefine      with_online
+%endif
 
-%define                rel             15
-#define                githash 5744981
-# $ git rev-list 1.0.0-alpha11..%{githash} --count
-#define                commits 216
-%define                subver  alpha11
 %define                php_min_version 5.3.4
-%include       /usr/lib/rpm/macros.php
 Summary:       Dependency Manager for PHP
 Name:          composer
-Version:       1.0.0
-Release:       %{rel}.%{subver}%{?commits:.%{commits}}%{?githash:.g%{githash}}
+Version:       1.10.26
+Release:       1
 License:       MIT
 Group:         Development/Languages/PHP
-#Source0:       https://github.com/composer/composer/archive/%{githash}/%{name}-%{version}-%{subver}-%{commits}-g%{githash}.tar.gz
-Source0:       https://github.com/composer/composer/archive/%{version}-%{subver}/%{name}-%{version}-%{subver}.tar.gz
-# Source0-md5: 5e4ff16cff75fae31285196c5f51a8f8
+Source0:       https://github.com/composer/composer/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 170c36246e52522e17540a6aaee57d8c
 Source2:       https://raw.githubusercontent.com/iArren/%{name}-bash-completion/86a8129/composer
 # Source2-md5: cdeebf0a0da1fd07d0fd886d0461642e
 Source3:       autoload.php
 Patch0:                autoload.patch
 Patch1:                update-memory-limit.patch
 Patch2:                svn-ignore-externals.patch
-Patch3:                version.patch
-URL:           http://www.getcomposer.org/
+URL:           https://getcomposer.org/
 BuildRequires: php-devel
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
 BuildRequires: rpmbuild(macros) >= 1.673
+# instead of filling duplicate deps for running tests,
+# update composer version that have neccessary runtime dependencies
+BuildRequires: composer >= 1.7.0
+%{?with_online:BuildRequires:  %{php_name}-cli}
 %if %{with tests}
-BuildRequires: composer >= 1.0.0-15.alpha11
+BuildRequires: git-core
 BuildRequires: phpab
-BuildRequires: phpunit
+BuildRequires: phpunit >= 4.8
 %endif
 Requires:      php(core) >= %{php_min_version}
 Requires:      php(ctype)
@@ -44,6 +42,7 @@ Requires:     php(filter)
 Requires:      php(hash)
 Requires:      php(json)
 Requires:      php(openssl)
+Requires:      php(pcntl)
 Requires:      php(pcre)
 Requires:      php(phar)
 Requires:      php(posix)
@@ -51,19 +50,25 @@ Requires:   php(simplexml)
 Requires:      php(spl)
 Requires:      php(zip)
 Requires:      php(zlib)
+Requires:      php-composer-ca-bundle >= 1.0.2
 Requires:      php-composer-semver >= 1.0.0
-Requires:      php-composer-spdx-licenses >= 1.0.0
-Requires:      php-justinrainbow-json-schema >= 1.4
-Requires:      php-seld-jsonlint >= 1.1.2
+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-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
 Suggests:      subversion
+Conflicts:     satis < 1.0.0-1.alpha1.193
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -87,12 +92,10 @@ Bash completion for Composer package and dependency manager.
 Pakiet ten dostarcza bashowe uzupełnianie nazw dla Composera.
 
 %prep
-%setup -qc -n %{name}-%{version}-%{release}
-mv composer-*/* .
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 mv composer.lock{,.disabled}
 # NOTE: do not use %{__php} macro here, need unversioned php binary
@@ -110,16 +113,12 @@ ln -s src/Composer/res
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
-# needs newer phpunit:
-# missing method PHPUnit_Framework_MockObject_Builder_InvocationMocker::willReturn()
-rm tests/Composer/Test/EventDispatcher/EventDispatcherTest.php
-rm tests/Composer/Test/IO/ConsoleIOTest.php
-rm tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php
-rm tests/Composer/Test/Package/RootAliasPackageTest.php
-rm tests/Composer/Test/Package/Version/VersionGuesserTest.php
-rm tests/Composer/Test/Util/GitHubTest.php
-
 %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