diff options
| author | Remi Collet <remi@remirepo.net> | 2020-01-22 17:03:41 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-01-22 17:03:41 +0100 |
| commit | 9c1b0eb0d7281a13d2ba586e73c3b6dbd28e242a (patch) | |
| tree | 4c2a9123dab1bcdf064e6341a1a2cdf3335367fd | |
| parent | 64afe8ec5cb8bf97c9a04d21a1f6ebedba775cda (diff) | |
fix deps
| -rw-r--r-- | php-cakephp4.spec | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/php-cakephp4.spec b/php-cakephp4.spec index 6fe03a9..1e67ad5 100644 --- a/php-cakephp4.spec +++ b/php-cakephp4.spec @@ -56,10 +56,6 @@ BuildRequires: php-pdo BuildRequires: php-reflection BuildRequires: php-simplexml BuildRequires: php-spl -# TODO -# "composer/ca-bundle": "^1.2": Http + Network -# "laminas/laminas-diactoros": "^2.2.2": Routing, TestSuite, Http -# "laminas/laminas-httphandlerrunner": "^1.1": Http # From composer.json, "require-dev": { # "cakephp/cakephp-codesniffer": "dev-next", # "mikey179/vfsstream": "^1.6", @@ -67,14 +63,17 @@ BuildRequires: php-spl # "phpunit/phpunit": "~8.5.0" BuildRequires: phpunit8 >= 8.5.0 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(mikey179/vfsstream) >= 1.6 with php-composer(mikey179/vfsstream) < 6) -# Ignore min version for now -BuildRequires: (php-composer(laminas/laminas-diactoros) >= 1.4.0 with php-composer(laminas/laminas-diactoros) < 3) -BuildRequires: (php-composer(psr/http-server-middleware) >= 1.0 with php-composer(psr/http-server-middleware) < 2) +BuildRequires: (php-composer(composer/ca-bundle) >= 1.2 with php-composer(composer/ca-bundle) < 6) +BuildRequires: (php-composer(mikey179/vfsstream) >= 1.6 with php-composer(mikey179/vfsstream) < 6) +BuildRequires: (php-composer(laminas/laminas-diactoros) >= 2.2.2 with php-composer(laminas/laminas-diactoros) < 3) +BuildRequires: (php-composer(laminas/laminas-httphandlerrunner) >= 1.1 with php-composer(laminas/laminas-httphandlerrunner) < 2) +BuildRequires: (php-composer(psr/http-server-middleware) >= 1.0 with php-composer(psr/http-server-middleware) < 2) BuildRequires: glibc-langpack-fr %else +BuildRequires: php-composer-ca-bundle >= 1.2 BuildRequires: php-mikey179-vfsstream >= 1.6 -BuildRequires: php-laminas-diactoros >= 1.4.0 +BuildRequires: php-laminas-diactoros2 >= 2.2.2 +BuildRequires: php-laminas-httphandlerrunner >= 1.1 BuildRequires: php-psr-http-server-middleware %endif %endif @@ -507,10 +506,9 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php'; '%{php_home}/Psr/Http/Message/autoload.php', '%{php_home}/Psr/Http/Server/autoload.php', '%{php_home}/Psr/Http/Server/middleware-autoload.php', - [ - '%{php_home}/Laminas/Diactoros2/autoload.php', - '%{php_home}/Laminas/Diactoros/autoload.php', - ], + '%{php_home}/Composer/CaBundle/autoload.php', + '%{php_home}/Laminas/Diactoros2/autoload.php', + '%{php_home}/Laminas/HttpHandlerRunner/autoload.php', '%{php_home}/org/bovigo/vfs/autoload.php', ]); EOF |