From aa15525b5e58715ceeadec8045a464c3d3fc7ec5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sun, 6 Aug 2017 11:09:05 +0200
Subject: switch

---
 php-nette-deprecated.spec | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

(limited to 'php-nette-deprecated.spec')

diff --git a/php-nette-deprecated.spec b/php-nette-deprecated.spec
index 297e4c8..8d833a6 100644
--- a/php-nette-deprecated.spec
+++ b/php-nette-deprecated.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    eb5c8276824e83d2fa8ab92261ad95cf24361b4c
+%global gh_commit    fde8fea8e3f1960ea6bcca03a996300b0ca41762
 #global gh_date      20150728
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     nette
@@ -17,8 +17,8 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.3.3
-%global specrel 1
+Version:        2.4.0
+%global specrel 2
 Release:        %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        APIs and features removed from Nette Framework
 
@@ -63,7 +63,7 @@ BuildRequires:  php-composer(tracy/tracy) >= 2.2
 BuildRequires:  php-composer(%{gh_owner}/tester) >= 1.1
 %endif
 
-# from phpcompatinfo report for version 2.3.2
+# from phpcompatinfo report for version 2.4.0
 Requires:       php-fileinfo
 Requires:       php-spl
 Requires:       php-tokenizer
@@ -101,8 +101,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
@@ -117,6 +115,7 @@ require_once '%{php_home}/%{ns_vendor}/Forms/autoload.php';
 require_once '%{php_home}/%{ns_vendor}/Mail/autoload.php';
 require_once '%{php_home}/%{ns_vendor}/RobotLoader/autoload.php';
 require_once '%{php_home}/%{ns_vendor}/SafeStream/autoload.php';
+require_once '%{php_home}/%{ns_vendor}/Security/autoload.php';
 require_once '%{php_home}/%{ns_vendor}/Utils/autoload.php';
 require_once '%{php_home}/Latte/autoload.php';
 require_once '%{php_home}/Tracy/autoload.php';
@@ -127,7 +126,22 @@ EOF
 php -r 'require "vendor/autoload.php";'
 
 : Run test suite in sources tree
-nette-tester --colors 0 -p php -c ./php.ini tests -s
+# remirepo:11
+run=0
+ret=0
+if which php56; then
+   php56 %{_bindir}/nette-tester --colors 0 -p php56 -C tests -s
+   run=1
+fi
+if which php70; then
+   php70 %{_bindir}/nette-tester --colors 0 -p php70 -C tests -s
+   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
@@ -147,8 +161,12 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Tue Sep 27 2016 Remi Collet <remi@fedoraproject.org> - 2.3.3-1
-- update to 2.3.3
+* Fri Aug  5 2016 Remi Collet <remi@fedoraproject.org> - 2.4.0-2
+- fix test suite autoloader
+
+* Thu Aug  4 2016 Remi Collet <remi@fedoraproject.org> - 2.4.0-1
+- update to 2.4.0
+- add dependency on nette/security >= 2.2
 
 * Sun Nov  8 2015 Remi Collet <remi@fedoraproject.org> - 2.3.2-1
 - update to 2.3.2
-- 
cgit