diff options
| -rw-r--r-- | composer-dev.json | 14 | ||||
| -rw-r--r-- | php-nette-robot-loader-dev.spec | 51 |
2 files changed, 45 insertions, 20 deletions
diff --git a/composer-dev.json b/composer-dev.json index 92d3d12..a407f85 100644 --- a/composer-dev.json +++ b/composer-dev.json @@ -14,13 +14,14 @@ } ], "require": { - "php": ">=5.3.1", + "php": ">=5.6.0", "nette/caching": "~2.2", "nette/finder": "~2.3", - "nette/utils": "~2.2" + "nette/utils": "~2.4" }, "require-dev": { - "nette/tester": "~1.4" + "nette/tester": "~2.0", + "tracy/tracy": "^2.3" }, "conflict": { "nette/nette": "<2.2" @@ -28,5 +29,10 @@ "autoload": { "classmap": ["src/"] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + } } diff --git a/php-nette-robot-loader-dev.spec b/php-nette-robot-loader-dev.spec index a05e52e..235dac4 100644 --- a/php-nette-robot-loader-dev.spec +++ b/php-nette-robot-loader-dev.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 0dbed866df47fd0425ce9a3cc9085779d8ada143 +%global gh_commit e5c86ce8b53c7d4be84244624c67485ee4c92dbc #global gh_date 20150728 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nette @@ -17,7 +17,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_owner}-%{gh_project} -Version: 2.3.2 +Version: 2.4.0 %global specrel 1 Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Nette RobotLoader: comfortable autoloading @@ -36,31 +36,33 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-composer(theseer/autoload) %if %{with_tests} -BuildRequires: php(language) >= 5.3.1 +BuildRequires: php(language) >= 5.6 BuildRequires: php-composer(%{gh_owner}/caching) >= 2.2 BuildRequires: php-composer(%{gh_owner}/finder) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/utils) >= 2.2 +BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4 BuildRequires: php-pcre BuildRequires: php-phar BuildRequires: php-spl # From composer.json, "require-dev": { -# "nette/tester": "~1.4" -BuildRequires: php-composer(%{gh_owner}/tester) >= 1.4 +# "nette/tester": "~2.0", +# "tracy/tracy": "^2.3" +BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 +BuildRequires: php-composer(tracy/tracy) >= 2.3 %endif # from composer.json, "require": { -# "php": ">=5.3.1" +# "php": ">=5.6.0" # "nette/caching": "~2.2", # "nette/finder": "~2.3", -# "nette/utils": "~2.2" -Requires: php(language) >= 5.3.1 +# "nette/utils": "~2.4" +Requires: php(language) >= 5.6 Requires: php-composer(%{gh_owner}/caching) >= 2.2 Requires: php-composer(%{gh_owner}/caching) < 3 Requires: php-composer(%{gh_owner}/finder) >= 2.3 Requires: php-composer(%{gh_owner}/finder) < 3 -Requires: php-composer(%{gh_owner}/utils) >= 2.2 +Requires: php-composer(%{gh_owner}/utils) >= 2.4 Requires: php-composer(%{gh_owner}/utils) < 3 -# from phpcompatinfo report for version 2.3.1 +# from phpcompatinfo report for version 2.4.0 Requires: php-pcre Requires: php-spl @@ -119,12 +121,24 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php'; EOF : Run test suite in sources tree -nette-tester --colors 0 -p php -c ./php.ini tests -s - -if which php70; then - cat /etc/opt/remi/php70/php.ini /etc/opt/remi/php70/php.d/*ini >php.ini - php70 %{_bindir}/nette-tester --colors 0 -p php70 -c ./php.ini tests -s +# remirepo:13 +ret=0 +run=0 +if which php56; then + cat /opt/remi/php56/root/etc/php.ini /opt/remi/php56/root/etc/php.d/*ini >php.ini + php56 %{_bindir}/nette-tester --colors 0 -p php56 -c ./php.ini tests -s || ret=1 + run=1 +fi +if which php71; then + cat /etc/opt/remi/php71/php.ini /etc/opt/remi/php71/php.d/*ini >php.ini + php71 %{_bindir}/nette-tester --colors 0 -p php71 -c ./php.ini tests -s || ret=1 + run=1 fi +if [ $run -eq 0 ]; then +%{_bindir}/nette-tester --colors 0 -p php -c ./php.ini tests -s +# remirepo:2 +fi +exit $ret %else : Test suite disabled %endif @@ -144,6 +158,11 @@ rm -rf %{buildroot} %changelog +* Thu Aug 4 2016 Remi Collet <remi@fedoraproject.org> - 2.4.0-1 +- update to 2.4.0 +- raise dependency on PHP >= 5.6 +- raise dependency on nette/utils >= 2.4 + * Mon Jun 20 2016 Remi Collet <remi@fedoraproject.org> - 2.3.2-1 - update to 2.3.2 |