php-nette-forms: 2.3.10

2 files changed, 28 insertions, 11 deletions

diff --git a/composer.json b/composer.json
index 41037fd..f095583 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
 		"php": ">=5.3.1",
 		"nette/component-model": "~2.2.0",
 		"nette/http": "~2.2",
-		"nette/utils": "~2.2"
+		"nette/utils": "~2.3.10"
 	},
 	"require-dev": {
 		"nette/di": "~2.3",
diff --git a/php-nette-forms.spec b/php-nette-forms.spec
index cef364e..c084e48 100644
--- a/php-nette-forms.spec
+++ b/php-nette-forms.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    e32577062a2544fedac8a95fbc393ab98a3291c7
+%global gh_commit    22ab1e9794fabe225b980ee4c31f57ee5b7f74e2
 #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.9
+Version:        2.3.10
 %global specrel 1
 Release:        %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        Nette Forms: greatly facilitates web forms
@@ -36,7 +36,7 @@ BuildRequires:  php-composer(theseer/autoload)
 BuildRequires:  php(language) >= 5.3.1
 BuildRequires:  php-composer(%{gh_owner}/component-model) >= 2.2
 BuildRequires:  php-composer(%{gh_owner}/http) >= 2.2
-BuildRequires:  php-composer(%{gh_owner}/utils) >= 2.2
+BuildRequires:  php-composer(%{gh_owner}/utils) >= 2.3.10
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # From composer.json, "require-dev": {
@@ -54,13 +54,13 @@ BuildRequires:  php-composer(tracy/tracy) >= 2.2
 #        "php": ">=5.3.1"
 #        "nette/component-model": "~2.2.0",
 #        "nette/http": "~2.2",
-#        "nette/utils": "~2.2"
+#        "nette/utils": "~2.3.10"
 Requires:       php(language) >= 5.3.1
 Requires:       php-composer(%{gh_owner}/component-model) >= 2.2.0
 Requires:       php-composer(%{gh_owner}/component-model) <  2.3
 Requires:       php-composer(%{gh_owner}/http) >= 2.2
 Requires:       php-composer(%{gh_owner}/http) <  3
-Requires:       php-composer(%{gh_owner}/utils) >= 2.2
+Requires:       php-composer(%{gh_owner}/utils) >= 2.3.10
 Requires:       php-composer(%{gh_owner}/utils) <  3
 # from phpcompatinfo report for version 2.3.6
 Requires:       php-pcre
@@ -126,13 +126,26 @@ 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
-
+# remirepo:15
+run=0
+ret=0
+if which php56; then
+   cat /opt/remi/php56/root/etc/php.ini /opt/remi/php56/root/etc/php.d/*ini >php.ini
+   echo 'session.save_path = "/tmp"' >>php.ini
+   php56 %{_bindir}/nette-tester --colors 0 -p php56 -c ./php.ini tests -s
+   run=1
+fi
 if which php70; then
-  cat /etc/opt/remi/php70/php.ini /etc/opt/remi/php70/php.d/*ini >php.ini
-  echo 'session.save_path = "/tmp"' >>php.ini
-  php70 %{_bindir}/nette-tester --colors 0 -p php70 -c ./php.ini tests -s
+   cat /etc/opt/remi/php70/php.ini /etc/opt/remi/php70/php.d/*ini >php.ini
+   echo 'session.save_path = "/tmp"' >>php.ini
+   php70 %{_bindir}/nette-tester --colors 0 -p php70 -c ./php.ini tests -s
+   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
@@ -155,6 +168,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul  1 2016 Remi Collet <remi@fedoraproject.org> - 2.3.10-1
+- update to 2.3.10
+- raise dependency on nette/utils ~2.3.10
+
 * Wed Jun  1 2016 Remi Collet <remi@fedoraproject.org> - 2.3.9-1
 - update to 2.3.9