summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-08-06 09:44:03 +0200
committerRemi Collet <remi@remirepo.net>2017-08-06 09:44:03 +0200
commit8d8a1d09c73300872dc138f6a5c1c0574ac53b06 (patch)
treef32ea786b95a510b6fb6f35d030517d8fc6134b8
parentffc3d21ee85948d870c6c46dbcd77d2dadda6654 (diff)
-rw-r--r--composer.json4
-rw-r--r--php-nette-component-model.spec43
2 files changed, 16 insertions, 31 deletions
diff --git a/composer.json b/composer.json
index bb43bda..20c2506 100644
--- a/composer.json
+++ b/composer.json
@@ -15,10 +15,10 @@
],
"require": {
"php": ">=5.6.0",
- "nette/utils": "^2.4"
+ "nette/utils": "^2.4 || ~3.0.0"
},
"require-dev": {
- "nette/tester": "~2.0",
+ "nette/tester": "^2.0",
"tracy/tracy": "^2.3"
},
"conflict": {
diff --git a/php-nette-component-model.spec b/php-nette-component-model.spec
index f748f33..1f1f2f6 100644
--- a/php-nette-component-model.spec
+++ b/php-nette-component-model.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 9b5817b246bf409b8f0f8309c23e599dd8729d28
+%global gh_commit b6197fa6867d816b08457ac73b04ba70f78682e3
#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.0
+Version: 2.3.1
%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 Component Model
Group: Development/Libraries
@@ -29,7 +29,6 @@ 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}
@@ -38,7 +37,7 @@ BuildRequires: php-pcre
BuildRequires: php-reflection
BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4
# From composer.json, "require-dev": {
-# "nette/tester": "~2.0",
+# "nette/tester": "^2.0",
# "tracy/tracy": "^2.3"
# ignore tracy (pass without)
BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0
@@ -46,10 +45,10 @@ BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0
# from composer.json, "require": {
# "php": ">=5.6.0",
-# "nette/utils": "^2.4"
+# "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) < 3
+Requires: php-composer(%{gh_owner}/utils) < 4
# from composer.json, "conflict": {
Conflicts: php-composer(%{gh_owner}/application) < 2.4
# from phpcompatinfo report for version 2.2.4
@@ -89,7 +88,6 @@ EOF
%install
-rm -rf %{buildroot}
mkdir -p %{buildroot}%{php_home}/%{ns_vendor}
cp -pr src/* %{buildroot}%{php_home}/%{ns_vendor}/
@@ -109,35 +107,19 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php';
EOF
: Run test suite in sources tree
-# remirepo:13
ret=0
-run=0
-if which php56; then
- cat /opt/remi/php56/root/etc/php.ini /opt/remi/php56/root/etc/php.d/*ini >php.ini
- php56 %{_bindir}/nette-tester --colors 0 -p php56 -c ./php.ini tests -s || ret=1
- run=1
-fi
-if which php71; then
- cat /etc/opt/remi/php71/php.ini /etc/opt/remi/php71/php.d/*ini >php.ini
- php71 %{_bindir}/nette-tester --colors 0 -p php71 -c ./php.ini tests -s || ret=1
- run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/nette-tester --colors 0 -p php -c ./php.ini tests -s
-# remirepo:2
-fi
+for cmd in php php56 php70 php71 php72; 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
@@ -146,6 +128,9 @@ rm -rf %{buildroot}
%changelog
+* Sun Aug 6 2017 Remi Collet <remi@remirepo.net> - 2.3.1-1
+- Update to 2.3.1
+
* Tue Aug 2 2016 Remi Collet <remi@fedoraproject.org> - 2.3.0-1
- update to 2.3.0
- raise dependency on PHP >= 5.6