switch

1 files changed, 67 insertions, 26 deletions

diff --git a/php-nette-di.spec b/php-nette-di.spec
index 0993fab..11ce220 100644
--- a/php-nette-di.spec
+++ b/php-nette-di.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    fe4d3264d1b1907a934e8a6627a5b87f35046089
+%global gh_commit    b3fe8551162279216e251e49b406e55cd2d255d5
 #global gh_date      20150728
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     nette
@@ -17,9 +17,9 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.3.13
+Version:        2.4.8
 %global specrel 1
-Release:        %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
+Release:        %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        Nette Dependency Injection Component
 
 Group:          Development/Libraries
@@ -33,36 +33,40 @@ 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-tokenizer
 BuildRequires:  php-pcre
 BuildRequires:  php-reflection
 BuildRequires:  php-spl
-BuildRequires:  php-tokenizer
 BuildRequires:  php-composer(%{gh_owner}/neon) >= 2.3.3
-BuildRequires:  php-composer(%{gh_owner}/php-generator) >= 2.3.6
-BuildRequires:  php-composer(%{gh_owner}/utils) >= 2.3.5
+BuildRequires:  php-composer(%{gh_owner}/php-generator) >= 2.6.1
+BuildRequires:  php-composer(%{gh_owner}/utils) >= 2.4.3
 # From composer.json, "require-dev": {
-#        "nette/tester": "~1.6"
-BuildRequires:  php-composer(%{gh_owner}/tester) >= 1.6
+#               "nette/tester": "^2.0",
+#               "tracy/tracy": "^2.3"
+BuildRequires:  php-composer(%{gh_owner}/tester) >= 2.0
 %endif
 
 # from composer.json, "require": {
-#        "php": ">=5.3.1"
-#        "nette/neon": "^2.3.3",
-#        "nette/php-generator": "^2.3.6",
-#        "nette/utils": "^2.3.5"
-Requires:       php(language) >= 5.3.1
+#               "php": ">=5.6.0",
+#               "ext-tokenizer": "*",
+#               "nette/neon": "^2.3.3 || ~3.0.0",
+#               "nette/php-generator": "^2.6.1 || ~3.0.0",
+#               "nette/utils": "^2.4.3 || ~3.0.0"
+Requires:       php(language) >= 5.6
+Requires:       php-tokenizer
 Requires:       php-composer(%{gh_owner}/neon) >= 2.3.3
-Requires:       php-composer(%{gh_owner}/neon) <  3
-Requires:       php-composer(%{gh_owner}/php-generator) >= 2.3.6
-Requires:       php-composer(%{gh_owner}/php-generator) <  3
-Requires:       php-composer(%{gh_owner}/utils) >= 2.3.5
-Requires:       php-composer(%{gh_owner}/utils) <  3
-# from phpcompatinfo report for version 2.3.6
+Requires:       php-composer(%{gh_owner}/neon) <  4
+Requires:       php-composer(%{gh_owner}/php-generator) >= 2.5
+Requires:       php-composer(%{gh_owner}/php-generator) <  4
+Requires:       php-composer(%{gh_owner}/utils) >= 2.4.3
+Requires:       php-composer(%{gh_owner}/utils) <  4
+# from composer.json, "conflict": {
+Conflicts:      php-composer(%{gh_owner}/bootstrap) < 2.4
+# from phpcompatinfo report for version 2.4.6
 Requires:       php-pcre
 Requires:       php-reflection
 Requires:       php-spl
-Requires:       php-tokenizer
 
 Provides:       php-composer(%{gh_owner}/%{gh_project}) = %{version}
 
@@ -104,8 +108,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
 
 : See https://github.com/nette/di/commit/0b83ea7a788cef9d2bceafd543201aa309790ed3
@@ -120,7 +122,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
+# 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
@@ -141,8 +158,32 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Dec 21 2016 Remi Collet <remi@fedoraproject.org> - 2.3.13-1
-- update to 2.3.13
+* Mon Mar 20 2017 Remi Collet <remi@remirepo.net> - 2.4.8-1
+- Update to 2.4.8
+- raise dependency on nette/php-generator 2.6.1
+
+* Mon Feb 20 2017 Remi Collet <remi@fedoraproject.org> - 2.4.7-1
+- update to 2.4.7
+
+* Sun Jan 15 2017 Remi Collet <remi@fedoraproject.org> - 2.4.6-1
+- update to 2.4.6
+- raise dependency on nette/php-generator 2.5
+- raise dependency on nette/php-utils 2.4.3
+
+* Fri Dec 23 2016 Remi Collet <remi@fedoraproject.org> - 2.4.5-1
+- update to 2.4.5
+
+* Wed Nov  9 2016 Remi Collet <remi@fedoraproject.org> - 2.4.4-1
+- update to 2.4.4
+
+* Tue Sep 27 2016 Remi Collet <remi@fedoraproject.org> - 2.4.3-1
+- update to 2.4.3
+
+* Tue Aug  2 2016 Remi Collet <remi@fedoraproject.org> - 2.4.2-1
+- update to 2.4.2
+- raise dependency on PHP >= 5.6
+- raise dependency on nette/php-generator >= 2.4
+- raise dependency on nette/utils >= 2.4
 
 * Sun Jul 31 2016 Remi Collet <remi@fedoraproject.org> - 2.3.12-1
 - update to 2.3.12