summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-04-02 09:06:37 +0200
committerRemi Collet <fedora@famillecollet.com>2016-04-02 09:06:37 +0200
commit45bb81d93ed627d511e152138a83d7cf1dad3bcb (patch)
tree9403bfe14a8605a162491c9f7589c0038ea37dbf
parent1ad19b6a59f2cd45921cb670edc985018c83eae2 (diff)
php-nette-safe-stream: 2.3.2
-rw-r--r--php-nette-safe-stream.spec22
1 files changed, 17 insertions, 5 deletions
diff --git a/php-nette-safe-stream.spec b/php-nette-safe-stream.spec
index 012706a..8f6aab3 100644
--- a/php-nette-safe-stream.spec
+++ b/php-nette-safe-stream.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit bf30db367b51a0932c44dcb9a378927644d48b2e
+%global gh_commit 4b9bb3266a537e59b10a2932f05dca47333420fc
#global gh_date 20150728
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner nette
@@ -17,8 +17,8 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.3.1
-%global specrel 2
+Version: 2.3.2
+%global specrel 1
Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Summary: Nette SafeStream: Atomic Operations
@@ -37,7 +37,9 @@ BuildRequires: php(language) >= 5.3.1
BuildRequires: php-date
# From composer.json, "require-dev": {
# "nette/tester": "~1.0"
+# "tracy/tracy": "^2.3"
BuildRequires: php-composer(%{gh_owner}/tester) >= 1.0
+BuildRequires: php-composer(tracy/tracy) >= 2.3
%endif
# from composer.json, "require": {
@@ -89,11 +91,17 @@ mkdir vendor
cat << 'EOF' | tee vendor/autoload.php
<?php
require_once '%{php_home}/Tester/autoload.php';
+require_once '%{php_home}/Tracy/autoload.php';
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
+%{_bindir}/nette-tester --colors 0 -p php -c ./php.ini tests -s
+
+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
+fi
%else
: Test suite disabled
%endif
@@ -114,8 +122,12 @@ rm -rf %{buildroot}
%changelog
+* Sat Apr 2 2016 Remi Collet <remi@fedoraproject.org> - 2.3.2-1
+- update to 2.3.2
+- run test suite with both php 5 and 7 when available
+
* Mon Nov 9 2015 Remi Collet <remi@fedoraproject.org> - 2.3.1-2
- fix directory ownership, from review #1277441
* Fri Oct 30 2015 Remi Collet <remi@fedoraproject.org> - 2.3.1-1
-- initial package \ No newline at end of file
+- initial package