v2.4.8

1 files changed, 77 insertions, 46 deletions

diff --git a/php-nette-application.spec b/php-nette-application.spec
index 751dd8d..bc95827 100644
--- a/php-nette-application.spec
+++ b/php-nette-application.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    ab1ed67f4b85e1be7af5d13bf00de61391544be6
+%global gh_commit    8f8f1071162c1bef8b0bc53ed7b435d342b81308
 #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 Application MVC Component
 
 Group:          Development/Libraries
@@ -29,58 +29,59 @@ Source0:        %{name}-%{version}-%{gh_short}.tgz
 # pull a git snapshot to get test sutie
 Source1:        makesrc.sh
 
-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}/component-model) >= 2.2
+BuildRequires:  php(language) >= 5.6
+BuildRequires:  php-composer(%{gh_owner}/component-model) >= 2.3
 BuildRequires:  php-composer(%{gh_owner}/http) >= 2.2
 BuildRequires:  php-composer(%{gh_owner}/reflection) >= 2.2
-BuildRequires:  php-composer(%{gh_owner}/security) >= 2.2
-BuildRequires:  php-composer(%{gh_owner}/utils) >= 2.2
+BuildRequires:  php-composer(%{gh_owner}/utils) >= 2.4
 BuildRequires:  php-pcre
 BuildRequires:  php-reflection
 BuildRequires:  php-spl
 # From composer.json, "require-dev": {
-#         "nette/tester": "~1.3",
-#         "nette/di": "~2.3",
-#         "nette/forms": "~2.2",
-#         "nette/robot-loader": "~2.2",
-#         "latte/latte": "~2.3.9"
-BuildRequires:  php-composer(%{gh_owner}/tester) >= 1.3
-BuildRequires:  php-composer(%{gh_owner}/di) >= 2.3
-BuildRequires:  php-composer(%{gh_owner}/forms) >= 2.2
-BuildRequires:  php-composer(%{gh_owner}/robot-loader) >= 2.2
-BuildRequires:  php-composer(latte/latte) >= 2.3.9
+#               "nette/tester": "^2.0",
+#               "nette/di": "^2.4 || ~3.0.0",
+#               "nette/forms": "^2.4",
+#               "nette/robot-loader": "~2.4.2 || ^3.0",
+#               "nette/security": "^2.4",
+#               "latte/latte": "^2.4.3",
+#               "tracy/tracy": "^2.4",
+#               "mockery/mockery": "^0.9.5"
+BuildRequires:  php-composer(%{gh_owner}/tester) >= 2.0
+BuildRequires:  php-composer(%{gh_owner}/di) >= 2.4
+BuildRequires:  php-composer(%{gh_owner}/forms) >= 2.4
+BuildRequires:  php-composer(%{gh_owner}/robot-loader) >= 2.4.2
+BuildRequires:  php-composer(%{gh_owner}/security) >= 2.4
+BuildRequires:  php-composer(latte/latte) >= 2.4.3
+BuildRequires:  php-composer(tracy/tracy) >= 2.4
+BuildRequires:  php-composer(mockery/mockery) >= 0.9.5
 %endif
 
 # from composer.json, "require": {
-#        "php": ">=5.3.1"
-#        "nette/component-model": "~2.2",
-#        "nette/http": "~2.2",
-#        "nette/reflection": "~2.2",
-#        "nette/security": "~2.2",
-#        "nette/utils": "~2.2"
-Requires:       php(language) >= 5.3.1
-Requires:       php-composer(%{gh_owner}/component-model) >= 2.2
+#               "php": ">=5.6.0"
+#               "nette/component-model": "^2.3",
+#               "nette/http": "^2.2",
+#               "nette/reflection": "^2.2",
+#               "nette/utils": "^2.4 || ~3.0.0"
+Requires:       php(language) >= 5.6
+Requires:       php-composer(%{gh_owner}/component-model) >= 2.3
 Requires:       php-composer(%{gh_owner}/component-model) <  3
 Requires:       php-composer(%{gh_owner}/http) >= 2.2
 Requires:       php-composer(%{gh_owner}/http) <  3
 Requires:       php-composer(%{gh_owner}/reflection) >= 2.2
 Requires:       php-composer(%{gh_owner}/reflection) <  3
-Requires:       php-composer(%{gh_owner}/security) >= 2.2
-Requires:       php-composer(%{gh_owner}/security) <  3
-Requires:       php-composer(%{gh_owner}/utils) >= 2.2
-Requires:       php-composer(%{gh_owner}/utils) <  3
+Requires:       php-composer(%{gh_owner}/utils) >= 2.4
+Requires:       php-composer(%{gh_owner}/utils) <  4
 # from composer.json, "suggest": {
 #       "nette/forms": "Allows to use Nette\\Application\\UI\\Form",
 #       "latte/latte": "Allows using Latte in templates"
-# from phpcompatinfo report for version 2.3.3
 %if 0%{?fedora} > 21
 Suggests:       php-composer(%{gh_owner}/forms)
 Suggests:       php-composer(latte/latte)
 %endif
+# from phpcompatinfo report for version 2.4.0
 Requires:       php-pcre
 Requires:       php-reflection
 Requires:       php-spl
@@ -103,6 +104,8 @@ To use this library, you just have to add, in your project:
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
+mv src/compatibility.php src/%{ns_project}/
+
 
 %build
 : Generate a classmap autoloader
@@ -114,7 +117,6 @@ foreach (array(
     '%{php_home}/%{ns_vendor}/ComponentModel/autoload.php' => true,
     '%{php_home}/%{ns_vendor}/Http/autoload.php'           => true,
     '%{php_home}/%{ns_vendor}/Reflection/autoload.php'     => true,
-    '%{php_home}/%{ns_vendor}/Security/autoload.php'       => true,
     '%{php_home}/%{ns_vendor}/Utils/autoload.php'          => true,
     // Optional
     '%{php_home}/%{ns_vendor}/Forms/autoload.php'          => false,
@@ -122,11 +124,12 @@ foreach (array(
     ) as $dep => $mandatory) {
     if ($mandatory || file_exists($dep)) require_once($dep);
 }
+
+require_once __DIR__ . '/compatibility.php';
 EOF
 
 
 %install
-rm -rf       %{buildroot}
 mkdir -p     %{buildroot}%{php_home}/%{ns_vendor}
 cp -pr src/* %{buildroot}%{php_home}/%{ns_vendor}/
 
@@ -139,8 +142,6 @@ rm tests/Bridges.DI/ApplicationExtension.scan.phpt
 rm tests/Application/MicroPresenter.response.phpt
 %endif
 
-: Generate configuration
-cat /etc/php.ini /etc/php.d/*ini >php.ini
 export LANG=fr_FR.utf8
 
 : Generate autoloader
@@ -150,27 +151,26 @@ cat << 'EOF' | tee vendor/autoload.php
 require_once '%{php_home}/Tester/autoload.php';
 require_once '%{php_home}/%{ns_vendor}/DI/autoload.php';
 require_once '%{php_home}/%{ns_vendor}/RobotLoader/autoload.php';
+require_once '%{php_home}/%{ns_vendor}/Security/autoload.php';
+require_once '%{php_home}/Mockery/autoload.php';
 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
-fi
+ret=0
+# PHP 7.2: https://github.com/nette/application/issues/181
+for cmd in php php56 php70 php71 php72; do
+   if which $cmd; then
+      $cmd %{_bindir}/nette-tester --colors 0 -p $cmd -C tests -s || ret=1
+   fi
+done
+exit $ret
 %else
 : Test suite disabled
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license license.md
 %doc readme.md contributing.md
@@ -180,6 +180,37 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug  6 2017 Remi Collet <remi@remirepo.net> - 2.4.8-1
+- Update to 2.4.8
+
+* Sat Aug  5 2017 Remi Collet <remi@remirepo.net> - 2.4.8-1
+- Update to 2.4.8
+
+* Fri Jun  2 2017 Remi Collet <remi@remirepo.net> - 2.4.6-1
+- Update to 2.4.6
+
+* Thu Feb  2 2017 Remi Collet <remi@fedoraproject.org> - 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
+
+* Wed Dec 21 2016 Remi Collet <remi@fedoraproject.org> - 2.4.3-1
+- update to 2.4.3
+
+* Tue Sep 27 2016 Remi Collet <remi@fedoraproject.org> - 2.4.2-1
+- update to 2.4.2
+
+* Thu Aug  4 2016 Remi Collet <remi@fedoraproject.org> - 2.4.1-2
+- fix autoloader
+
+* Thu Aug  4 2016 Remi Collet <remi@fedoraproject.org> - 2.4.1-1
+- update to 2.4.1
+- raise dependency on PHP >= 5.6
+- raise dependency on nette/utils >= 2.4
+- raise dependency on nette/component-model >= 2.3
+- drop dependency on nette/security
+
 * Mon Jun 20 2016 Remi Collet <remi@fedoraproject.org> - 2.3.13-1
 - update to 2.3.12