diff options
| -rw-r--r-- | composer-dev.json | 20 | ||||
| -rw-r--r-- | php-nette-database-dev.spec | 58 |
2 files changed, 52 insertions, 26 deletions
diff --git a/composer-dev.json b/composer-dev.json index 153ed1f..34be09d 100644 --- a/composer-dev.json +++ b/composer-dev.json @@ -14,15 +14,16 @@ } ], "require": { - "php": ">=5.3.1", + "php": ">=5.6.0", "ext-pdo": "*", - "nette/caching": "^2.2", - "nette/utils": "^2.3.5" + "nette/caching": "~2.2", + "nette/utils": "~2.4" }, "require-dev": { - "nette/tester": "^1.3", - "nette/di": "^2.3", - "mockery/mockery": "^0.9.1" + "nette/tester": "~2.0", + "nette/di": "~2.4", + "mockery/mockery": "~1.0.0", + "tracy/tracy": "^2.4" }, "conflict": { "nette/nette": "<2.2" @@ -30,5 +31,10 @@ "autoload": { "classmap": ["src/"] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + } } diff --git a/php-nette-database-dev.spec b/php-nette-database-dev.spec index 47f4032..2c73826 100644 --- a/php-nette-database-dev.spec +++ b/php-nette-database-dev.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit a4c7ea17470a7d888df5738f5e63b2605899f289 +%global gh_commit 05aa9112f3da7cf0ef799ad6b0fe223485deb827 #global gh_date 20150728 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nette @@ -22,7 +22,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.3.9 +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 Database Component @@ -38,35 +38,38 @@ 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-pdo BuildRequires: php-composer(%{gh_owner}/caching) >= 2.2 -BuildRequires: php-composer(%{gh_owner}/utils) >= 2.2 +BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4 BuildRequires: php-date BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-spl # From composer.json, "require-dev": { -# "nette/tester": "^1.3" -# "nette/di": "^2.3", -# "mockery/mockery": "^0.9.1" -BuildRequires: php-composer(%{gh_owner}/tester) >= 1.3 -BuildRequires: php-composer(%{gh_owner}/di) >= 2.3 +# "nette/tester": "~2.0", +# "nette/di": "~2.4", +# "mockery/mockery": "~1.0.0", +# "tracy/tracy": "^2.4" +BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 +BuildRequires: php-composer(%{gh_owner}/di) >= 2.4 +# version 1.0.0 is not released BuildRequires: php-composer(mockery/mockery) >= 0.9.1 +BuildRequires: php-composer(tracy/tracy) >= 2.3 %endif # from composer.json, "require": { -# "php": ">=5.3.1" +# "php": ">=5.6.0" # "ext-pdo": "*", -# "nette/caching": "^2.2", -# "nette/utils": "^2.3.5" -Requires: php(language) >= 5.3.1 +# "nette/caching": "~2.2", +# "nette/utils": "~2.4" +Requires: php(language) >= 5.6 Requires: php-pdo Requires: php-composer(%{gh_owner}/caching) >= 2.2 Requires: php-composer(%{gh_owner}/caching) < 3 -Requires: php-composer(%{gh_owner}/utils) >= 2.3.5 +Requires: php-composer(%{gh_owner}/utils) >= 2.4 Requires: php-composer(%{gh_owner}/utils) < 3 -# from phpcompatinfo report for version 2.3.7 +# from phpcompatinfo report for version 2.4.0 Requires: php-date Requires: php-json Requires: php-pcre @@ -137,12 +140,24 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php'; EOF : Run test suite in sources tree +# 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 - -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:2 fi +exit $ret %else : Test suite disabled %endif @@ -163,6 +178,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 + * Wed Jun 1 2016 Remi Collet <remi@fedoraproject.org> - 2.3.9-1 - update to 2.3.9 |