switch

1 files changed, 55 insertions, 23 deletions

diff --git a/php-nette-http.spec b/php-nette-http.spec
index ffe223d..daa210c 100644
--- a/php-nette-http.spec
+++ b/php-nette-http.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    dccceb20f346744927472b88732804cef6a73669
+%global gh_commit    ef812049a89866eff5aa6b1a39f1a4d8c9adc607
 #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.8
+Version:        2.4.5
 %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 HTTP Component
 
 Group:          Development/Libraries
@@ -33,38 +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-composer(%{gh_owner}/finder) >= 2.2
-BuildRequires:  php-composer(%{gh_owner}/utils) >= 2.2
+BuildRequires:  php(language) >= 5.6
+BuildRequires:  php-composer(%{gh_owner}/utils) >= 2.4
 BuildRequires:  php-fileinfo
 BuildRequires:  php-date
 BuildRequires:  php-filter
+BuildRequires:  php-json
 BuildRequires:  php-pcre
 BuildRequires:  php-session
-BuildRequires:  php-reflection
 BuildRequires:  php-spl
 # From composer.json, "require-dev": {
-#        "nette/di": "~2.3",
-#        "nette/tester": "~1.4"
-BuildRequires:  php-composer(%{gh_owner}/di) >= 2.3
-BuildRequires:  php-composer(%{gh_owner}/tester) >= 1.4
+#               "nette/di": "^2.4.6 || ~3.0.0",
+#               "nette/tester": "^2.0",
+#               "tracy/tracy": "^2.4"
+BuildRequires:  php-composer(%{gh_owner}/di) >= 2.4.6
+BuildRequires:  php-composer(%{gh_owner}/tester) >= 2.0
+BuildRequires:  php-composer(tracy/tracy) >= 2.4
 %endif
 
 # from composer.json, "require": {
-#        "php": ">=5.3.1"
-#        "nette/utils": "~2.2, >=2.2.2"
-Requires:       php(language) >= 5.3.1
-Requires:       php-composer(%{gh_owner}/utils) >= 2.2.2
-Requires:       php-composer(%{gh_owner}/utils) <  3
+#               "php": ">=5.6.0",
+#               "nette/utils": "^2.4 || ~3.0.0"
+Requires:       php(language) >= 5.6
+Requires:       php-composer(%{gh_owner}/utils) >= 2.4
+Requires:       php-composer(%{gh_owner}/utils) <  4
 # from composer.json, "suggest": {
-#        "ext-fileinfo": "to detect type of uploaded files"
+#               "ext-fileinfo": "to detect type of uploaded files",
+#               "nette/security": "allows use Nette\\Http\\UserStorage"
 Requires:       php-fileinfo
 # from phpcompatinfo report for version 2.3.3
 Requires:       php-date
 Requires:       php-filter
+Requires:       php-json
 Requires:       php-pcre
 Requires:       php-session
-Requires:       php-reflection
 Requires:       php-spl
 
 Provides:       php-composer(%{gh_owner}/%{gh_project}) = %{version}
@@ -106,8 +108,6 @@ cp -pr src/* %{buildroot}%{php_home}/%{ns_vendor}/
 rm tests/Http/Session.start.error.phpt
 %endif
 
-: Generate configuration
-cat /etc/php.ini /etc/php.d/*ini >php.ini
 export LANG=fr_FR.utf8
 
 : Generate autoloader
@@ -120,7 +120,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
+run=0
+ret=0
+if which php56; then
+   php56 %{_bindir}/nette-tester --colors 0 -p php56 -C tests -s
+   run=1
+fi
+if which php71; then
+   php71 %{_bindir}/nette-tester --colors 0 -p php71 -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
@@ -141,8 +156,25 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Dec 21 2016 Remi Collet <remi@fedoraproject.org> - 2.3.8-1
-- update to 2.3.8
+* Mon Mar 20 2017 Remi Collet <remi@remirepo.net> - 2.4.5-1
+- Update to 2.4.5
+
+* Thu Jan 19 2017 Remi Collet <remi@fedoraproject.org> - 2.4.4-1
+- update to 2.4.4
+
+* Tue Dec 20 2016 Remi Collet <remi@fedoraproject.org> - 2.4.3-1
+- update to 2.4.3
+
+* Wed Oct 19 2016 Remi Collet <remi@fedoraproject.org> - 2.4.2-1
+- update to 2.4.2
+
+* Tue Sep 27 2016 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
+- raise dependency on nette/utils >= 2.4
 
 * Mon Jun 20 2016 Remi Collet <remi@fedoraproject.org> - 2.3.7-1
 - update to 2.3.7