summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-12-03 13:45:44 +0100
committerRemi Collet <fedora@famillecollet.com>2015-12-03 13:45:44 +0100
commitfd5a8ad18285c89f11e575ca038149d6a193d362 (patch)
tree8ee5337059bf8db15ff0ff9ce42ed44b8a25f217
parent5cab6b5204923673946c0f1a04d2c56e5c1ce81d (diff)
php-nette-database: 2.3.8
-rw-r--r--php-nette-database.spec23
1 files changed, 16 insertions, 7 deletions
diff --git a/php-nette-database.spec b/php-nette-database.spec
index bac8ed2..d3c91c2 100644
--- a/php-nette-database.spec
+++ b/php-nette-database.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 32ab8af7abb405c6415ef335d3395dea9d575859
+%global gh_commit 1e12005c73411cade4691ca8e1c3b96c1d09a05e
#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.7
+Version: 2.3.8
%global specrel 1
Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Summary: Nette Database Component
@@ -42,9 +42,9 @@ BuildRequires: php-json
BuildRequires: php-pcre
BuildRequires: php-spl
# From composer.json, "require-dev": {
-# "nette/tester": "~1.3"
-# "nette/di": "~2.3",
-# "mockery/mockery": "~0.9.1"
+# "nette/tester": "^1.3"
+# "nette/di": "^2.3",
+# "mockery/mockery": "^0.9.1"
BuildRequires: php-composer(%{gh_owner}/tester) >= 1.3
BuildRequires: php-composer(%{gh_owner}/di) >= 2.3
BuildRequires: php-composer(mockery/mockery) >= 0.9.1
@@ -53,7 +53,7 @@ BuildRequires: php-composer(mockery/mockery) >= 0.9.1
# from composer.json, "require": {
# "php": ">=5.3.1"
# "ext-pdo": "*",
-# "nette/caching": "~2.2",
+# "nette/caching": "^2.2",
# "nette/utils": "^2.3.5"
Requires: php(language) >= 5.3.1
Requires: php-pdo
@@ -132,7 +132,12 @@ 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
@@ -153,5 +158,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Dec 3 2015 Remi Collet <remi@fedoraproject.org> - 2.3.8-1
+- update to 2.3.8
+- run test suite with both php 5 and 7 when available
+
* Fri Oct 30 2015 Remi Collet <remi@fedoraproject.org> - 2.3.7-1
- initial package \ No newline at end of file