commit df6da7f36795c6b244ef64c1dbe74740ee5f6e10
Author: Elan Ruusamäe <g...@delfi.ee>
Date: Tue May 3 10:48:15 2016 +0300
conflict with older satis
PHP Fatal error: Class 'Composer\Command\Command' not found in
/usr/share/php/Composer/Satis/Command/BuildCommand.php on line 37
composer.spec | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/composer.spec b/composer.spec
index b79b7a2..8c03229 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
Summary: Dependency Manager for PHP
Name: composer
Version: 1.0.1
-Release: 2
+Release: 3
License: MIT
Group: Development/Languages/PHP
Source0:
https://github.com/composer/composer/archive/%{version}/%{name}-%{version}.tar.gz
@@ -32,6 +32,7 @@ BuildRequires: git-core
BuildRequires: phpab
BuildRequires: phpunit
%endif
+Requires: ca-certificates >= 20141019-3
Requires: php(core) >= %{php_min_version}
Requires: php(ctype)
Requires: php(date)
@@ -51,7 +52,6 @@ Requires: php-composer-spdx-licenses >= 1.0.0
Requires: php-justinrainbow-json-schema >= 1.6
Requires: php-seld-cli-prompt >= 1.0.0
Requires: php-seld-jsonlint >= 1.4
-Requires: ca-certificates >= 20141019-3
Requires: php-seld-phar-utils >= 1.0.0
Requires: php-symfony2-ClassLoader >= 2.7.7
Requires: php-symfony2-Console >= 2.7.7
@@ -61,6 +61,7 @@ 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)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/composer.git/commitdiff/df6da7f36795c6b244ef64c1dbe74740ee5f6e10
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
