diff options
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | composer.json | 9 | ||||
| -rw-r--r-- | php-zendframework-zend-expressive-twigrenderer.spec | 40 |
3 files changed, 31 insertions, 25 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1ab5c4f --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/composer.json b/composer.json index 6dea406..964c063 100644 --- a/composer.json +++ b/composer.json @@ -13,13 +13,13 @@ ], "extra": { "branch-alias": { - "dev-master": "1.4-dev", - "dev-develop": "1.5-dev" + "dev-master": "1.5-dev", + "dev-develop": "1.6-dev" } }, "require": { "php": "^5.6 || ^7.0", - "container-interop/container-interop": "^1.2", + "psr/container": "^1.0", "twig/twig": "^1.32 || ^2.1", "zendframework/zend-expressive-helpers": "^1.4 || ^2.2 || ^3.0.1 || ^4.0", "zendframework/zend-expressive-router": "^1.3.2 || ^2.1", @@ -30,6 +30,9 @@ "phpunit/phpunit": "^6.0.7 || ^5.7.14", "zendframework/zend-coding-standard": "~1.0.0" }, + "conflict": { + "container-interop/container-interop": "<1.2.0" + }, "autoload": { "psr-4": { "Zend\\Expressive\\Twig\\": "src/" diff --git a/php-zendframework-zend-expressive-twigrenderer.spec b/php-zendframework-zend-expressive-twigrenderer.spec index 00c3a90..5d04ad7 100644 --- a/php-zendframework-zend-expressive-twigrenderer.spec +++ b/php-zendframework-zend-expressive-twigrenderer.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 2e6eca456d1449813102c84bdd04e43e7108e4b9 +%global gh_commit e48e49fb99b1598819a6f9f719d7825517295a7a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-expressive-twigrenderer @@ -21,7 +21,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 1.4.0 +Version: 1.5.0 Release: 1%{?dist} Summary: Twig integration for %{library} @@ -31,12 +31,12 @@ URL: https://zendframework.github.io/zend-expressive/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch # Tests %if %{with_tests} BuildRequires: php(language) >= 5.6 -BuildRequires: php-composer(container-interop/container-interop) >= 1.2 +BuildRequires: php-composer(psr/container) < 2 +BuildRequires: php-composer(psr/container) >= 1.0 # test suite fails with v2 BuildRequires: php-composer(twig/twig) < 2 BuildRequires: php-composer(twig/twig) >= 1.32 @@ -69,8 +69,8 @@ BuildRequires: php-zendframework-zend-loader >= 2.5.1-4 # "zendframework/zend-expressive-router": "^1.3.2 || ^2.1", # "zendframework/zend-expressive-template": "^1.0.4" Requires: php(language) >= 5.6 -Requires: php-composer(container-interop/container-interop) >= 1.2 -Requires: php-composer(container-interop/container-interop) < 2 +Requires: php-composer(psr/container) >= 1.0 +Requires: php-composer(psr/container) < 2 Requires: php-composer(twig/twig) >= 1.32 Requires: php-composer(twig/twig) < 3 Requires: php-composer(%{gh_owner}/zend-expressive-helpers) >= 1.4 @@ -121,6 +121,7 @@ if (file_exists('%{php_home}/Twig/autoload.php')) { if (file_exists('%{php_home}/Aura/Di/autoload.php')) { require_once '%{php_home}/Aura/Di/autoload.php'; } +require_once '%{php_home}/Psr/Container/autoload.php'; EOF @@ -129,8 +130,6 @@ EOF %install -rm -rf %{buildroot} - mkdir -p %{buildroot}%{php_home}/Zend/%{library} cp -pr src %{buildroot}%{php_home}/Zend/%{library}/%{sublib} @@ -154,28 +153,20 @@ Zend\Loader\AutoloaderFactory::factory(array( require_once '%{php_home}/Zend/autoload.php'; EOF -# remirepo:7 ret=0 -if which php56; then - php56 %{_bindir}/phpunit --verbose || ret=1 -fi -if which php71; then - php71 %{_bindir}/phpunit6 --verbose || ret=1 -fi -%{phpunit} --verbose -# remirepo:1 +for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1 + fi +done exit $ret %else : Test suite disabled %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md @@ -185,6 +176,11 @@ rm -rf %{buildroot} %changelog +* Sun Aug 13 2017 Remi Collet <remi@remirepo.net> - 1.5.0-1 +- Update to 1.5.0 +- add dependency on psr/container +- drop dependency on container-interop/container-interop + * Wed Mar 15 2017 Remi Collet <remi@remirepo.net> - 1.4.0-1 - Update to 1.4.0 - use phpunit6 on F26+ |