diff options
| -rw-r--r-- | composer-autoload.php | 21 | ||||
| -rw-r--r-- | composer.spec | 15 |
2 files changed, 22 insertions, 14 deletions
diff --git a/composer-autoload.php b/composer-autoload.php index f1f20ac..6bead2e 100644 --- a/composer-autoload.php +++ b/composer-autoload.php @@ -7,23 +7,24 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Composer\\', __DIR__); // Dependencies -\Fedora\Autoloader\Dependencies::required(array( - array( +\Fedora\Autoloader\Dependencies::required([ + [ + $vendorDir . '/Symfony4/Component/Console/autoload.php', $vendorDir . '/Symfony3/Component/Console/autoload.php', $vendorDir . '/Symfony/Component/Console/autoload.php', - ), - array( + ], [ + $vendorDir . '/Symfony4/Component/Finder/autoload.php', $vendorDir . '/Symfony3/Component/Finder/autoload.php', $vendorDir . '/Symfony/Component/Finder/autoload.php', - ), - array( + ], [ + $vendorDir . '/Symfony4/Component/Process/autoload.php', $vendorDir . '/Symfony3/Component/Process/autoload.php', $vendorDir . '/Symfony/Component/Process/autoload.php', - ), - array( + ], [ + $vendorDir . '/Symfony4/Component/Filesystem/autoload.php', $vendorDir . '/Symfony3/Component/Filesystem/autoload.php', $vendorDir . '/Symfony/Component/Filesystem/autoload.php', - ), + ], $vendorDir . '/Seld/JsonLint/autoload.php', $vendorDir . '/Seld/PharUtils/autoload.php', $vendorDir . '/Seld/CliPrompt/autoload.php', @@ -32,5 +33,5 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php'; $vendorDir . '/Composer/Semver/autoload.php', $vendorDir . '/Psr/Log/autoload.php', $vendorDir . '/JsonSchema5/autoload.php', -)); +]); diff --git a/composer.spec b/composer.spec index 0ddbc8d..8ff96ee 100644 --- a/composer.spec +++ b/composer.spec @@ -18,14 +18,14 @@ #global upstream_prever RC %if 0%{?fedora} >= 27 -%global symfony_prefix php-symfony4 +%global symfony_prefix php-symfony3 %else %global symfony_prefix php-symfony %endif Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dependency Manager for PHP Group: Development/Libraries @@ -48,7 +48,7 @@ BuildRequires: php-cli %if %{with_tests} BuildRequires: php-justinrainbow-json-schema5 BuildRequires: php-composer(composer/spdx-licenses) < 2 -BuildRequires: php-composer(composer/spdx-licenses) >= 1.0 +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 @@ -94,7 +94,8 @@ BuildRequires: php-PsrLog >= 1.0.0-8 Requires: php(language) >= 5.3.2 Requires: php-cli Requires: php-justinrainbow-json-schema5 -Requires: php-composer(composer/spdx-licenses) >= 1.0 +# See https://github.com/composer/composer/pull/6974 +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 @@ -264,6 +265,12 @@ exit $ret %changelog +* Thu Jan 4 2018 Remi Collet <remi@remirepo.net> - 1.6.0-2 +- open https://github.com/composer/composer/pull/6974 + Fix dependency on composer/spdx-licenses +- raise dependency on composer/spdx-licenses 1.2 +- switch to Symfony 3 on F27+ + * Thu Jan 4 2018 Remi Collet <remi@remirepo.net> - 1.6.0-1 - Update to 1.6.0 |