switch

1 files changed, 34 insertions, 16 deletions

diff --git a/php-nette-neon.spec b/php-nette-neon.spec
index 27bec62..cfecdd8 100644
--- a/php-nette-neon.spec
+++ b/php-nette-neon.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    75699de201932e6de6b249824dc8c53d0f442cd5
+%global gh_commit    1a78ff64b1e161ebccc03bdf9366450a69365f5b
 #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.5
+Version:        2.4.1
 %global specrel 1
 Release:        %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        Nette NEON: parser and generator for Nette Object Notation
@@ -33,25 +33,28 @@ 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-iconv
 BuildRequires:  php-date
 BuildRequires:  php-json
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # From composer.json, "require-dev": {
-#        "nette/tester": "~1.4"
+#		"nette/tester": "~2.0",
+#		"tracy/tracy": "^2.3"
+# ignore tester min version (pass with 1.7), ignore tracy (pass without)
 BuildRequires:  php-composer(%{gh_owner}/tester) >= 1.4
 %endif
 
 # from composer.json, "require": {
-#        "php": ">=5.3.1"
-#        "ext-iconv": "*"
-Requires:       php(language) >= 5.3.1
+#               "php": ">=5.6.0"
+#               "ext-iconv": "*",
+#               "ext-json": "*"
+Requires:       php(language) >= 5.6
 Requires:       php-iconv
-# from phpcompatinfo report for version 2.3.3
-Requires:       php-date
 Requires:       php-json
+# from phpcompatinfo report for version 2.4.0
+Requires:       php-date
 Requires:       php-pcre
 Requires:       php-spl
 
@@ -82,8 +85,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
 
 : Generate autoloader
@@ -95,12 +96,22 @@ 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
+# remirepo:11
+ret=0
+run=0
+if which php56; then
+   php56 %{_bindir}/nette-tester --colors 0 -p php56 -C tests -s || ret=1
+   run=1
+fi
+if which php71; then
+   php71 %{_bindir}/nette-tester --colors 0 -p php71 -C tests -s || ret=1
+   run=1
 fi
+if [ $run -eq 0 ]; then
+%{_bindir}/nette-tester --colors 0 -p php -C tests -s
+# remirepo:2
+fi
+exit $ret
 %else
 : Test suite disabled
 %endif
@@ -120,6 +131,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Jan 15 2017 Remi Collet <remi@fedoraproject.org> - 2.4.1-1
+- update to 2.4.1
+
+* Tue Aug  2 2016 Remi Collet <remi@fedoraproject.org> - 2.4.0-1
+- update to 2.4.0
+- raise dependency on PHP >= 5.6
+
 * Mon Jun 20 2016 Remi Collet <remi@fedoraproject.org> - 2.3.5-1
 - update to 2.3.5