switch

1 files changed, 36 insertions, 26 deletions

diff --git a/php-nette-database.spec b/php-nette-database.spec
index 90ef19f..563af15 100644
--- a/php-nette-database.spec
+++ b/php-nette-database.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    ed0dc48c58ddf9042f736f3c1ac431dfdd825019
+%global gh_commit    debc7db9f4d7ffff71e2c3a81f841fbcbab4610d
 #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.10
+Version:        2.4.2
 %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 || ~3.0.0",
+#               "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 || ~3.0.0"
+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) <  3
-# from phpcompatinfo report for version 2.3.7
+Requires:       php-composer(%{gh_owner}/utils) >= 2.4
+Requires:       php-composer(%{gh_owner}/utils) <  4
+# from phpcompatinfo report for version 2.4.0
 Requires:       php-date
 Requires:       php-json
 Requires:       php-pcre
@@ -114,8 +117,6 @@ cp -pr src/* %{buildroot}%{php_home}/%{ns_vendor}/
 
 %check
 %if %{with_tests}
-: Generate configuration
-cat /etc/php.ini /etc/php.d/*ini >php.ini
 export LANG=fr_FR.utf8
 
 %if 0%{?rhel} != 5
@@ -137,12 +138,13 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php';
 EOF
 
 : Run test suite in sources tree
-%{_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
-fi
+ret=0
+for cmd in php56 php70 php71 php; do
+   if which $cmd; then
+   $cmd %{_bindir}/nette-tester --colors 0 -p $cmd -C tests -s || ret=1
+   fi
+done
+exit $ret
 %else
 : Test suite disabled
 %endif
@@ -163,8 +165,16 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Oct 19 2016 Remi Collet <remi@fedoraproject.org> - 2.3.10-1
-- update to 2.3.10
+* Thu Feb  2 2017 Remi Collet <remi@fedoraproject.org> - 2.4.2-1
+- update to 2.4.2
+
+* Wed Oct 19 2016 Remi Collet <remi@fedoraproject.org> - 2.4.1-1
+- update to 2.4.1
+
+* 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