diff options
| -rw-r--r-- | composer-dev.json | 52 | ||||
| -rw-r--r-- | php-nette-application-dev.spec | 85 |
2 files changed, 107 insertions, 30 deletions
diff --git a/composer-dev.json b/composer-dev.json new file mode 100644 index 0000000..0175c0e --- /dev/null +++ b/composer-dev.json @@ -0,0 +1,52 @@ +{ + "name": "nette/application", + "description": "Nette Application MVC Component", + "homepage": "https://nette.org", + "license": ["BSD-3-Clause", "GPL-2.0", "GPL-3.0"], + "authors": [ + { + "name": "David Grudl", + "homepage": "https://davidgrudl.com" + }, + { + "name": "Nette Community", + "homepage": "https://nette.org/contributors" + } + ], + "require": { + "php": ">=5.6.0", + "nette/component-model": "~2.3", + "nette/http": "~2.2", + "nette/reflection": "~2.2", + "nette/utils": "~2.4" + }, + "suggest": { + "nette/forms": "Allows to use Nette\\Application\\UI\\Form", + "latte/latte": "Allows using Latte in templates" + }, + "require-dev": { + "nette/tester": "~2.0", + "nette/di": "~2.4", + "nette/forms": "~2.4", + "nette/robot-loader": "~2.4", + "nette/security": "~2.4", + "latte/latte": "^2.4.1", + "tracy/tracy": "^2.4" + }, + "conflict": { + "nette/nette": "<2.2", + "nette/di": "<2.4", + "nette/forms": "<2.4", + "nette/latte": "<2.4" + }, + "autoload": { + "classmap": ["src/"], + "files": ["src/compatibility.php"] + }, + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + } +} diff --git a/php-nette-application-dev.spec b/php-nette-application-dev.spec index d218fd1..512941d 100644 --- a/php-nette-application-dev.spec +++ b/php-nette-application-dev.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit ab1ed67f4b85e1be7af5d13bf00de61391544be6 +%global gh_commit d47e06c90589184f8846fe7483a885b34168c370 #global gh_date 20150728 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nette @@ -17,7 +17,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_owner}-%{gh_project} -Version: 2.3.13 +Version: 2.4.1 %global specrel 1 Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Nette Application MVC Component @@ -33,54 +33,54 @@ 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", +# "nette/forms": "~2.4", +# "nette/robot-loader": "~2.4", +# "nette/security": "~2.4", +# "latte/latte": "^2.4.1", +# "tracy/tracy": "^2.4" +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 +BuildRequires: php-composer(%{gh_owner}/security) >= 2.4 +BuildRequires: php-composer(latte/latte) >= 2.4.1 +BuildRequires: php-composer(tracy/tracy) >= 2.4 %endif # from composer.json, "require": { -# "php": ">=5.3.1" -# "nette/component-model": "~2.2", +# "php": ">=5.6.0" +# "nette/component-model": "~2.3", # "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 +# "nette/utils": "~2.4" +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) >= 2.4 Requires: php-composer(%{gh_owner}/utils) < 3 # 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 +103,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 @@ -122,6 +124,8 @@ foreach (array( ) as $dep => $mandatory) { if ($mandatory || file_exists($dep)) require_once($dep); } + +require_once __DIR__ . '/compatibility.php'; EOF @@ -154,12 +158,26 @@ 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:15 +run=0 +ret=0 +if which php56; then + cat /opt/remi/php56/root/etc/php.ini /opt/remi/php56/root/etc/php.d/*ini >php.ini + echo 'session.save_path = "/tmp"' >>php.ini + php56 %{_bindir}/nette-tester --colors 0 -p php56 -c ./php.ini tests -s + run=1 +fi 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 + cat /etc/opt/remi/php70/php.ini /etc/opt/remi/php70/php.d/*ini >php.ini + echo 'session.save_path = "/tmp"' >>php.ini + php70 %{_bindir}/nette-tester --colors 0 -p php70 -c ./php.ini tests -s + run=1 +fi +if [ $run -eq 0 ]; then +%{_bindir}/nette-tester --colors 0 -p php -c ./php.ini tests -s +# remirepo:2 fi +exit $ret %else : Test suite disabled %endif @@ -180,6 +198,13 @@ rm -rf %{buildroot} %changelog +* 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 |