From 332764c2d813f082c60c707ef047e6ef7f820b35 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 5 Aug 2017 11:51:26 +0200 Subject: switch --- composer-dev.json | 41 ---------- composer.json | 19 +++-- php-nette-http-dev.spec | 193 ------------------------------------------------ php-nette-http.spec | 78 +++++++++++++------ 4 files changed, 68 insertions(+), 263 deletions(-) delete mode 100644 composer-dev.json delete mode 100644 php-nette-http-dev.spec diff --git a/composer-dev.json b/composer-dev.json deleted file mode 100644 index b2cd6c0..0000000 --- a/composer-dev.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "nette/http", - "description": "Nette HTTP 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/utils": "^2.4 || ~3.0.0" - }, - "require-dev": { - "nette/di": "^2.4.6 || ~3.0.0", - "nette/tester": "^2.0", - "tracy/tracy": "^2.4" - }, - "conflict": { - "nette/nette": "<2.2" - }, - "suggest": { - "ext-fileinfo": "to detect type of uploaded files", - "nette/security": "allows use Nette\\Http\\UserStorage" - }, - "autoload": { - "classmap": ["src/"] - }, - "minimum-stability": "dev", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - } -} diff --git a/composer.json b/composer.json index 8f4640b..b2cd6c0 100644 --- a/composer.json +++ b/composer.json @@ -14,21 +14,28 @@ } ], "require": { - "php": ">=5.3.1", - "nette/utils": "~2.2, >=2.2.2" + "php": ">=5.6.0", + "nette/utils": "^2.4 || ~3.0.0" }, "require-dev": { - "nette/di": "~2.3", - "nette/tester": "~1.4" + "nette/di": "^2.4.6 || ~3.0.0", + "nette/tester": "^2.0", + "tracy/tracy": "^2.4" }, "conflict": { "nette/nette": "<2.2" }, "suggest": { - "ext-fileinfo": "to detect type of uploaded files" + "ext-fileinfo": "to detect type of uploaded files", + "nette/security": "allows use Nette\\Http\\UserStorage" }, "autoload": { "classmap": ["src/"] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + } } diff --git a/php-nette-http-dev.spec b/php-nette-http-dev.spec deleted file mode 100644 index daa210c..0000000 --- a/php-nette-http-dev.spec +++ /dev/null @@ -1,193 +0,0 @@ -# remirepo/fedora spec file for php-nette-http -# -# 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 ef812049a89866eff5aa6b1a39f1a4d8c9adc607 -#global gh_date 20150728 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner nette -%global gh_project http -%global ns_vendor Nette -%global ns_project Http -%global php_home %{_datadir}/php -%global with_tests 0%{!?_without_tests:1} - -Name: php-%{gh_owner}-%{gh_project} -Version: 2.4.5 -%global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} -Summary: Nette HTTP Component - -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.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-spl -# From composer.json, "require-dev": { -# "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.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", -# "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-spl - -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} - - -%description -HTTP request and response are encapsulated in Nette\Http\Request and -Nette\Http\Response objects which offer comfortable API and also act -as sanitization filter. - -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}/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} -%if 0%{?rhel} == 7 -: Ignore failed test - only bad message -rm tests/Http/Session.start.error.phpt -%endif - -export LANG=fr_FR.utf8 - -: Generate autoloader -mkdir vendor -cat << 'EOF' | tee vendor/autoload.php - - 2.4.5-1 -- Update to 2.4.5 - -* Thu Jan 19 2017 Remi Collet - 2.4.4-1 -- update to 2.4.4 - -* Tue Dec 20 2016 Remi Collet - 2.4.3-1 -- update to 2.4.3 - -* Wed Oct 19 2016 Remi Collet - 2.4.2-1 -- update to 2.4.2 - -* Tue Sep 27 2016 Remi Collet - 2.4.1-1 -- update to 2.4.1 - -* Tue Aug 2 2016 Remi Collet - 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 - 2.3.7-1 -- update to 2.3.7 - -* Sun Apr 3 2016 Remi Collet - 2.3.6-1 -- update to 2.3.6 - -* Sat Apr 2 2016 Remi Collet - 2.3.5-1 -- update to 2.3.5 - -* Wed Jan 20 2016 Remi Collet - 2.3.4-1 -- update to 2.3.4 -- run test suite with both php 5 and 7 when available - -* Fri Oct 30 2015 Remi Collet - 2.3.3-1 -- initial package 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 - 2.3.8-1 -- update to 2.3.8 +* Mon Mar 20 2017 Remi Collet - 2.4.5-1 +- Update to 2.4.5 + +* Thu Jan 19 2017 Remi Collet - 2.4.4-1 +- update to 2.4.4 + +* Tue Dec 20 2016 Remi Collet - 2.4.3-1 +- update to 2.4.3 + +* Wed Oct 19 2016 Remi Collet - 2.4.2-1 +- update to 2.4.2 + +* Tue Sep 27 2016 Remi Collet - 2.4.1-1 +- update to 2.4.1 + +* Tue Aug 2 2016 Remi Collet - 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 - 2.3.7-1 - update to 2.3.7 -- cgit