summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json4
-rw-r--r--php-nette-forms.spec47
2 files changed, 19 insertions, 32 deletions
diff --git a/composer.json b/composer.json
index 05da13d..b19cfbb 100644
--- a/composer.json
+++ b/composer.json
@@ -16,8 +16,8 @@
"require": {
"php": ">=5.6.0",
"nette/component-model": "~2.3",
- "nette/http": "~2.2",
- "nette/utils": "~2.4"
+ "nette/http": "^2.3.8",
+ "nette/utils": "^2.4.6"
},
"require-dev": {
"nette/di": "~2.4",
diff --git a/php-nette-forms.spec b/php-nette-forms.spec
index 007cb0b..7c713d7 100644
--- a/php-nette-forms.spec
+++ b/php-nette-forms.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 8a76e69dd2725bed3bf3c24f6fed1c6d60945f04
+%global gh_commit 85eedf22e1a6ae58fb79b6fc0119d22035163386
#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.4.4
+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 Forms: greatly facilitates web forms
@@ -29,14 +29,13 @@ 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-composer(%{gh_owner}/http) >= 2.3.8
+BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4.6
BuildRequires: php-pcre
BuildRequires: php-spl
# From composer.json, "require-dev": {
@@ -53,14 +52,14 @@ BuildRequires: php-composer(tracy/tracy) >= 2.4
# from composer.json, "require": {
# "php": ">=5.6.0"
# "nette/component-model": "~2.3",
-# "nette/http": "~2.2",
-# "nette/utils": "~2.4"
+# "nette/http": "~2.3.8",
+# "nette/utils": "~2.4.6"
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) >= 2.3.8
Requires: php-composer(%{gh_owner}/http) < 3
-Requires: php-composer(%{gh_owner}/utils) >= 2.4
+Requires: php-composer(%{gh_owner}/utils) >= 2.4.6
Requires: php-composer(%{gh_owner}/utils) < 3
# from phpcompatinfo report for version 2.4.1
Requires: php-pcre
@@ -98,8 +97,6 @@ EOF
%install
-rm -rf %{buildroot}
-
mkdir -p %{buildroot}%{php_home}/%{ns_vendor}
cp -pr src/* %{buildroot}%{php_home}/%{ns_vendor}/
@@ -123,33 +120,20 @@ 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
+# PHP 7.2: https://github.com/nette/http/issues/128 (each)
+for cmd in php php56 php70 php71; do
+ if which $cmd; then
+ $cmd %{_bindir}/nette-tester --colors 0 -p $cmd -C tests -d serialize_precision=14 -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
@@ -161,6 +145,9 @@ rm -rf %{buildroot}
%changelog
+* Sun Aug 6 2017 Remi Collet <remi@remirepo.net> - 2.4.5-1
+- Update to 2.4.5
+
* Thu Mar 30 2017 Remi Collet <remi@remirepo.net> - 2.4.4-1
- Update to 2.4.4