diff options
| -rw-r--r-- | composer-dev.json | 40 | ||||
| -rw-r--r-- | composer.json | 21 | ||||
| -rw-r--r-- | php-nette-forms-dev.spec | 191 | ||||
| -rw-r--r-- | php-nette-forms.spec | 76 |
4 files changed, 60 insertions, 268 deletions
diff --git a/composer-dev.json b/composer-dev.json deleted file mode 100644 index 05da13d..0000000 --- a/composer-dev.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "nette/forms", - "description": "Nette Forms: greatly facilitates web forms", - "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/utils": "~2.4" - }, - "require-dev": { - "nette/di": "~2.4", - "nette/tester": "~2.0", - "latte/latte": "~2.4", - "tracy/tracy": "^2.4" - }, - "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 f095583..05da13d 100644 --- a/composer.json +++ b/composer.json @@ -14,16 +14,16 @@ } ], "require": { - "php": ">=5.3.1", - "nette/component-model": "~2.2.0", + "php": ">=5.6.0", + "nette/component-model": "~2.3", "nette/http": "~2.2", - "nette/utils": "~2.3.10" + "nette/utils": "~2.4" }, "require-dev": { - "nette/di": "~2.3", - "nette/tester": "~1.3", - "latte/latte": "~2.3.2", - "tracy/tracy": "~2.2" + "nette/di": "~2.4", + "nette/tester": "~2.0", + "latte/latte": "~2.4", + "tracy/tracy": "^2.4" }, "conflict": { "nette/nette": "<2.2" @@ -31,5 +31,10 @@ "autoload": { "classmap": ["src/"] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + } } diff --git a/php-nette-forms-dev.spec b/php-nette-forms-dev.spec deleted file mode 100644 index 0cf5b1b..0000000 --- a/php-nette-forms-dev.spec +++ /dev/null @@ -1,191 +0,0 @@ -# remirepo/fedora spec file for php-nette-forms -# -# 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 c2618a144a7cd0a1f41143e18387d9c48cef91cb -#global gh_date 20150728 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner nette -%global gh_project forms -%global ns_vendor Nette -%global ns_project Forms -%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 Forms: greatly facilitates web forms - -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}/component-model) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/http) >= 2.2 -BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4 -BuildRequires: php-pcre -BuildRequires: php-spl -# From composer.json, "require-dev": { -# "nette/di": "~2.4", -# "nette/tester": "~2.0" -# "latte/latte": "~2.4" -# "tracy/tracy": "~2.4" -BuildRequires: php-composer(%{gh_owner}/di) >= 2.4 -BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 -BuildRequires: php-composer(latte/latte) >= 2.4 -BuildRequires: php-composer(tracy/tracy) >= 2.4 -%endif - -# from composer.json, "require": { -# "php": ">=5.6.0" -# "nette/component-model": "~2.3", -# "nette/http": "~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}/utils) >= 2.4 -Requires: php-composer(%{gh_owner}/utils) < 3 -# from phpcompatinfo report for version 2.4.1 -Requires: php-pcre -Requires: php-spl - -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} - - -%description -Nette\Forms greatly facilitates creating and processing web forms. -What it can really do? -- validate sent data both client-side (JavaScript) and server-side -- provide high level of security -- multiple render modes -- translations, i18n - -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}/ComponentModel/autoload.php'; -require_once '%{php_home}/%{ns_vendor}/Http/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}/ - -# Notice: don't install assets, only used in tests -rm -rf %{buildroot}%{php_home}/%{ns_vendor}/assets - - -%check -%if %{with_tests} -export LANG=fr_FR.utf8 - -: Generate autoloader -mkdir vendor -cat << 'EOF' | tee vendor/autoload.php -<?php -require_once '%{php_home}/Tester/autoload.php'; -require_once '%{php_home}/Latte/autoload.php'; -require_once '%{php_home}/Tracy/autoload.php'; -require_once '%{php_home}/%{ns_vendor}/DI/autoload.php'; -require_once '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php'; -EOF - -: Run test suite in sources tree -# 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 - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{!?_licensedir:%global license %%doc} -%license license.md -%doc readme.md contributing.md -%doc composer.json -%doc src/assets -%doc examples -%{php_home}/%{ns_vendor}/%{ns_project} -%{php_home}/%{ns_vendor}/Bridges - - -%changelog -* 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-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 - -* Fri Jul 1 2016 Remi Collet <remi@fedoraproject.org> - 2.3.10-1 -- update to 2.3.10 -- raise dependency on nette/utils ~2.3.10 - -* Wed Jun 1 2016 Remi Collet <remi@fedoraproject.org> - 2.3.9-1 -- update to 2.3.9 - -* Sat Feb 20 2016 Remi Collet <remi@fedoraproject.org> - 2.3.8-1 -- update to 2.3.8 - -* Wed Jan 20 2016 Remi Collet <remi@fedoraproject.org> - 2.3.7-1 -- update to 2.3.7 -- run test suite with both php 5 and 7 when available - -* Tue Oct 20 2015 Remi Collet <remi@fedoraproject.org> - 2.3.6-1 -- initial package diff --git a/php-nette-forms.spec b/php-nette-forms.spec index 0c1eeb9..0cf5b1b 100644 --- a/php-nette-forms.spec +++ b/php-nette-forms.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 30b4887e8661ee53c06a7683508f1a888a1b944b +%global gh_commit c2618a144a7cd0a1f41143e18387d9c48cef91cb #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.12 +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 Forms: greatly facilitates web forms @@ -33,36 +33,36 @@ 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}/utils) >= 2.3.10 +BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4 BuildRequires: php-pcre BuildRequires: php-spl # From composer.json, "require-dev": { -# "nette/di": "~2.3", -# "nette/tester": "~1.3" -# "latte/latte": "~2.3.2" -# "tracy/tracy": "~2.2" -BuildRequires: php-composer(%{gh_owner}/di) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/tester) >= 1.3 -BuildRequires: php-composer(latte/latte) >= 2.3.2 -BuildRequires: php-composer(tracy/tracy) >= 2.2 +# "nette/di": "~2.4", +# "nette/tester": "~2.0" +# "latte/latte": "~2.4" +# "tracy/tracy": "~2.4" +BuildRequires: php-composer(%{gh_owner}/di) >= 2.4 +BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 +BuildRequires: php-composer(latte/latte) >= 2.4 +BuildRequires: php-composer(tracy/tracy) >= 2.4 %endif # from composer.json, "require": { -# "php": ">=5.3.1" -# "nette/component-model": "~2.2.0", +# "php": ">=5.6.0" +# "nette/component-model": "~2.3", # "nette/http": "~2.2", -# "nette/utils": "~2.3.10" -Requires: php(language) >= 5.3.1 -Requires: php-composer(%{gh_owner}/component-model) >= 2.2.0 -Requires: php-composer(%{gh_owner}/component-model) < 2.3 +# "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}/utils) >= 2.3.10 +Requires: php-composer(%{gh_owner}/utils) >= 2.4 Requires: php-composer(%{gh_owner}/utils) < 3 -# from phpcompatinfo report for version 2.3.6 +# from phpcompatinfo report for version 2.4.1 Requires: php-pcre Requires: php-spl @@ -109,9 +109,6 @@ rm -rf %{buildroot}%{php_home}/%{ns_vendor}/assets %check %if %{with_tests} -: Generate configuration -cat /etc/php.ini /etc/php.d/*ini >php.ini -echo 'session.save_path = "/tmp"' >>php.ini export LANG=fr_FR.utf8 : Generate autoloader @@ -126,7 +123,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 @@ -149,11 +161,17 @@ rm -rf %{buildroot} %changelog -* Wed Dec 21 2016 Remi Collet <remi@fedoraproject.org> - 2.3.12-1 -- update to 2.3.12 +* 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.3.11-1 -- update to 2.3.11 +* 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-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 * Fri Jul 1 2016 Remi Collet <remi@fedoraproject.org> - 2.3.10-1 - update to 2.3.10 |