From 10e2fbbb54c5b4991c0cbd286c712a8a360d2900 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 5 Aug 2017 11:54:50 +0200 Subject: switch --- composer-dev.json | 51 ----------- composer.json | 23 +++-- php-nette-bootstrap-dev.spec | 205 ------------------------------------------- php-nette-bootstrap.spec | 76 ++++++++++------ 4 files changed, 62 insertions(+), 293 deletions(-) delete mode 100644 composer-dev.json delete mode 100644 php-nette-bootstrap-dev.spec diff --git a/composer-dev.json b/composer-dev.json deleted file mode 100644 index c4ef526..0000000 --- a/composer-dev.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "name": "nette/bootstrap", - "description": "Nette Bootstrap", - "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/di": "~2.4.7", - "nette/utils": "~2.4" - }, - "suggest": { - "nette/robot-loader": "to use Configurator::createRobotLoader()", - "tracy/tracy": "to use Configurator::enableTracy()" - }, - "require-dev": { - "nette/application": "~2.3", - "nette/caching": "~2.3", - "nette/database": "~2.3", - "nette/forms": "~2.3", - "nette/http": "~2.4.0", - "nette/mail": "~2.3", - "nette/robot-loader": "^2.4.2 || ^3.0", - "nette/safe-stream": "~2.2", - "nette/security": "~2.3", - "nette/tester": "~2.0", - "latte/latte": "~2.2", - "tracy/tracy": "^2.4.1" - }, - "conflict": { - "nette/nette": "<2.2" - }, - "autoload": { - "classmap": ["src/"] - }, - "minimum-stability": "dev", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - } -} diff --git a/composer.json b/composer.json index 1018199..c4ef526 100644 --- a/composer.json +++ b/composer.json @@ -14,27 +14,27 @@ } ], "require": { - "php": ">=5.3.1", - "nette/di": "~2.3.0", - "nette/utils": "~2.2" + "php": ">=5.6.0", + "nette/di": "~2.4.7", + "nette/utils": "~2.4" }, "suggest": { "nette/robot-loader": "to use Configurator::createRobotLoader()", - "tracy/tracy": "to use Configurator::enableDebugger()" + "tracy/tracy": "to use Configurator::enableTracy()" }, "require-dev": { "nette/application": "~2.3", "nette/caching": "~2.3", "nette/database": "~2.3", "nette/forms": "~2.3", - "nette/http": "~2.3", + "nette/http": "~2.4.0", "nette/mail": "~2.3", - "nette/robot-loader": "~2.2", + "nette/robot-loader": "^2.4.2 || ^3.0", "nette/safe-stream": "~2.2", "nette/security": "~2.3", - "nette/tester": "~1.3", + "nette/tester": "~2.0", "latte/latte": "~2.2", - "tracy/tracy": "~2.3" + "tracy/tracy": "^2.4.1" }, "conflict": { "nette/nette": "<2.2" @@ -42,5 +42,10 @@ "autoload": { "classmap": ["src/"] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + } } diff --git a/php-nette-bootstrap-dev.spec b/php-nette-bootstrap-dev.spec deleted file mode 100644 index 17ff690..0000000 --- a/php-nette-bootstrap-dev.spec +++ /dev/null @@ -1,205 +0,0 @@ -# remirepo/fedora spec file for php-nette-bootstrap -# -# Copyright (c) 2015-2017 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ -# -# Please, preserve the changelog entries -# -%global gh_commit 2c27747f5aff2e436ebf542e0ea566bea1db2d53 -#global gh_date 20150728 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner nette -%global gh_project bootstrap -%global ns_vendor Nette -%global ns_project Bootstrap -%global php_home %{_datadir}/php -%global with_tests 0%{!?_without_tests:1} - -Name: php-%{gh_owner}-%{gh_project} -Version: 2.4.3 -%global specrel 1 -Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} -Summary: Nette Bootstrap - -Group: Development/Libraries -License: BSD or GPLv2 or GPLv3 -URL: https://github.com/%{gh_owner}/%{gh_project} -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-tokenizer -BuildRequires: php-pcre -BuildRequires: php-reflection -BuildRequires: php-composer(%{gh_owner}/di) >= 2.4.7 -BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4 -# From composer.json, "require-dev": { -# "nette/application": "~2.3", -# "nette/caching": "~2.3", -# "nette/database": "~2.3", -# "nette/forms": "~2.3", -# "nette/http": "~2.4.0", -# "nette/mail": "~2.3", -# "nette/robot-loader": "^2.4.2 || ^3.0", -# "nette/safe-stream": "~2.2", -# "nette/security": "~2.3", -# "nette/tester": "~2.0", -# "latte/latte": "~2.2", -# "tracy/tracy": "~2.4.1" -# ignore not yet available components -BuildRequires: php-composer(%{gh_owner}/application) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/caching) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/database) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/forms) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/http) >= 2.4.0 -BuildRequires: php-composer(%{gh_owner}/mail) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/robot-loader) >= 2.4.2 -BuildRequires: php-composer(%{gh_owner}/safe-stream) >= 2.2 -BuildRequires: php-composer(%{gh_owner}/security) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 -BuildRequires: php-composer(latte/latte) >= 2.2 -BuildRequires: php-composer(tracy/tracy) >= 2.4.1 -%endif - -# from composer.json, "require": { -# "php": ">=5.6.0" -# "nette/di": "~2.4.7", -# "nette/utils": "~2.4" -Requires: php(language) >= 5.3.1 -Requires: php-tokenizer -Requires: php-composer(%{gh_owner}/di) >= 2.4.7 -Requires: php-composer(%{gh_owner}/di) < 2.5 -Requires: php-composer(%{gh_owner}/utils) >= 2.4 -Requires: php-composer(%{gh_owner}/utils) < 3 -# from phpcompatinfo report for version 2.4.1 -Requires: php-reflection -Requires: php-date -Requires: php-pcre -%if 0%{?fedora} > 21 -Suggests: php-pecl(memcache) -%endif - -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} - - -%description -Loads Nette Framework and all libraries. - -Class Configurator creates so called DI container -and handles application initialization. - -To use this library, you just have to add, in your project: - require_once '%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php'; - - -%prep -%setup -q -n %{gh_project}-%{gh_commit} - - -%build -: Generate a classmap autoloader -phpab --output src/%{ns_project}/autoload.php src - -cat << 'EOF' | tee -a src/%{ns_project}/autoload.php -// Dependencies -require_once '%{php_home}/%{ns_vendor}/DI/autoload.php'; -require_once '%{php_home}/%{ns_vendor}/Utils/autoload.php'; -EOF - - -%install -rm -rf %{buildroot} -mkdir -p %{buildroot}%{php_home}/%{ns_vendor} -cp -pr src/* %{buildroot}%{php_home}/%{ns_vendor}/ - - -%check -%if %{with_tests} -export LANG=fr_FR.utf8 - -: Generate autoloader -mkdir vendor -cat << 'EOF' | tee vendor/autoload.php - - 2.4.3-1 -- update to 2.4.3 -- raise dependency on nette/di 2.4.7 - -* Wed Dec 21 2016 Remi Collet - 2.4.2-1 -- update to 2.4.2 - -* Thu Aug 4 2016 Remi Collet - 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/di >= 2.4 - -* Mon Jun 20 2016 Remi Collet - 2.3.5-1 -- update to 2.3.5 - -* Mon Nov 30 2015 Remi Collet - 2.3.4-1 -- update to 2.3.4 - -* Fri Oct 30 2015 Remi Collet - 2.3.3-2 -- more tests - -* Tue Oct 20 2015 Remi Collet - 2.3.3-1 -- initial package diff --git a/php-nette-bootstrap.spec b/php-nette-bootstrap.spec index 698dfb9..17ff690 100644 --- a/php-nette-bootstrap.spec +++ b/php-nette-bootstrap.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 1fc6e52b790864d2973d479a4460a89cec1f51f8 +%global gh_commit 2c27747f5aff2e436ebf542e0ea566bea1db2d53 #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.5 +Version: 2.4.3 %global specrel 1 Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Nette Bootstrap @@ -37,49 +37,49 @@ BuildRequires: php(language) >= 5.3.1 BuildRequires: php-tokenizer BuildRequires: php-pcre BuildRequires: php-reflection -BuildRequires: php-composer(%{gh_owner}/di) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/utils) >= 2.2 +BuildRequires: php-composer(%{gh_owner}/di) >= 2.4.7 +BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4 # From composer.json, "require-dev": { # "nette/application": "~2.3", # "nette/caching": "~2.3", # "nette/database": "~2.3", # "nette/forms": "~2.3", -# "nette/http": "~2.3", +# "nette/http": "~2.4.0", # "nette/mail": "~2.3", -# "nette/robot-loader": "~2.2", +# "nette/robot-loader": "^2.4.2 || ^3.0", # "nette/safe-stream": "~2.2", # "nette/security": "~2.3", -# "nette/tester": "~1.3", +# "nette/tester": "~2.0", # "latte/latte": "~2.2", -# "tracy/tracy": "~2.3" +# "tracy/tracy": "~2.4.1" # ignore not yet available components BuildRequires: php-composer(%{gh_owner}/application) >= 2.3 BuildRequires: php-composer(%{gh_owner}/caching) >= 2.3 BuildRequires: php-composer(%{gh_owner}/database) >= 2.3 BuildRequires: php-composer(%{gh_owner}/forms) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/http) >= 2.3 +BuildRequires: php-composer(%{gh_owner}/http) >= 2.4.0 BuildRequires: php-composer(%{gh_owner}/mail) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/robot-loader) >= 2.2 +BuildRequires: php-composer(%{gh_owner}/robot-loader) >= 2.4.2 BuildRequires: php-composer(%{gh_owner}/safe-stream) >= 2.2 BuildRequires: php-composer(%{gh_owner}/security) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/tester) >= 1.3 +BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 BuildRequires: php-composer(latte/latte) >= 2.2 -BuildRequires: php-composer(tracy/tracy) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/tester) >= 1.3 +BuildRequires: php-composer(tracy/tracy) >= 2.4.1 %endif # from composer.json, "require": { -# "php": ">=5.3.1" -# "nette/di": "~2.3.0", -# "nette/utils": "~2.2" +# "php": ">=5.6.0" +# "nette/di": "~2.4.7", +# "nette/utils": "~2.4" Requires: php(language) >= 5.3.1 Requires: php-tokenizer -Requires: php-composer(%{gh_owner}/di) >= 2.3 -Requires: php-composer(%{gh_owner}/di) < 2.4 -Requires: php-composer(%{gh_owner}/utils) >= 2.2 +Requires: php-composer(%{gh_owner}/di) >= 2.4.7 +Requires: php-composer(%{gh_owner}/di) < 2.5 +Requires: php-composer(%{gh_owner}/utils) >= 2.4 Requires: php-composer(%{gh_owner}/utils) < 3 -# from phpcompatinfo report for version 2.3.3 +# from phpcompatinfo report for version 2.4.1 Requires: php-reflection +Requires: php-date Requires: php-pcre %if 0%{?fedora} > 21 Suggests: php-pecl(memcache) @@ -121,8 +121,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 @@ -145,13 +143,22 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php'; EOF : Run test suite in sources tree -nette-tester --colors 0 -p php -c ./php.ini tests -s - -# remirepo:4 -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 +# 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 @@ -172,6 +179,19 @@ rm -rf %{buildroot} %changelog +* Mon Feb 20 2017 Remi Collet - 2.4.3-1 +- update to 2.4.3 +- raise dependency on nette/di 2.4.7 + +* Wed Dec 21 2016 Remi Collet - 2.4.2-1 +- update to 2.4.2 + +* Thu Aug 4 2016 Remi Collet - 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/di >= 2.4 + * Mon Jun 20 2016 Remi Collet - 2.3.5-1 - update to 2.3.5 -- cgit