switch

1 files changed, 31 insertions, 13 deletions

diff --git a/php-nette-tester.spec b/php-nette-tester.spec
index a7783db..374ca6d 100644
--- a/php-nette-tester.spec
+++ b/php-nette-tester.spec
@@ -6,8 +6,8 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    d97534578e8cf66eabe081e7d5eaa4dd527ab0c8
-#global gh_date      20150728
+%global gh_commit    72dbafd21029770cb0ea01fceb2cb344bf13bd91
+%global gh_date      20161216
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     nette
 %global gh_project   tester
@@ -15,8 +15,8 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-nette-tester
-Version:        1.7.1
-%global specrel 1
+Version:        2.0.0
+%global specrel 2
 Release:        %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        An easy-to-use PHP unit testing framework
 
@@ -30,7 +30,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-composer(theseer/autoload)
 %if %{with_tests}
-BuildRequires:  php(language) >= 5.3
+BuildRequires:  php(language) >= 5.4
 BuildRequires:  php-cli
 BuildRequires:  php-date
 BuildRequires:  php-dom
@@ -48,9 +48,9 @@ BuildRequires:  glibc-langpack-fr
 %endif
 
 # from composer.json
-#        "php": ">=5.3.0"
-Requires:       php(language) >= 5.3
-# from phpcompatinfo report for version 1.7.0
+#        "php": ">=5.4.0"
+Requires:       php(language) >= 5.4
+# from phpcompatinfo report for version 2.0.0
 Requires:       php-cli
 Requires:       php-date
 Requires:       php-dom
@@ -97,16 +97,28 @@ install -Dpm 755 nette-tester %{buildroot}%{_bindir}/nette-tester
 %check
 %if %{with_tests}
 : Generate configuration
+# NOTICE: -C seems to doesn't work for tester itself
 cat /etc/php.ini /etc/php.d/*ini >php.ini
 export LANG=fr_FR.utf8
 
-: 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 src/tester.php --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 src/tester.php --colors 0 -p php71 -c ./php.ini tests -s || ret=1
+   run=1
+fi
+if [ $run -eq 0 ]; then
 php src/tester.php --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 src/tester.php --colors 0 -p php70 -c ./php.ini tests -s
+# remirepo:2
 fi
+exit $ret
 %else
 : Test suite disabled
 %endif
@@ -127,6 +139,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 21 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.2.20161216git72dbafd
+- refresh
+
+* Tue Aug  2 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.1.20160414git7d29c02
+- update to 2.0.0-dev
+
 * Sun Mar 20 2016 Remi Collet <remi@fedoraproject.org> - 1.7.1-1
 - update to 1.7.1
 - sources from git snapshot