summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-02-22 15:44:19 +0100
committerRemi Collet <fedora@famillecollet.com>2016-02-22 15:44:19 +0100
commit41f8d94cec25dcab4fb11823fc08868661b5513f (patch)
treeba6f1b838606bf7734589c3f4659840e9e806762
parent1a281e41916bacce91dc04e7c81c409ea6ae375d (diff)
php-nette-caching: 2.3.5
-rw-r--r--php-nette-caching.spec17
1 files changed, 13 insertions, 4 deletions
diff --git a/php-nette-caching.spec b/php-nette-caching.spec
index 008fe65..8bc4811 100644
--- a/php-nette-caching.spec
+++ b/php-nette-caching.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit a588a12f4faace29fc2a5d8775f01ecf36a7ae10
+%global gh_commit 0cb5c2c91e92a155ca5c1700479476b80c30dece
#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.4
+Version: 2.3.5
%global specrel 1
Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Summary: Nette Caching Component
@@ -100,7 +100,7 @@ cp -pr src/* %{buildroot}%{php_home}/%{ns_vendor}/
%check
%if %{with_tests}
: Ignore tests which require memcache
-rm tests/Storages/Memcache*
+rm tests/Storages/*Memcache*
: Generate configuration
cat /etc/php.ini /etc/php.d/*ini >php.ini
@@ -117,7 +117,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
@@ -138,6 +143,10 @@ rm -rf %{buildroot}
%changelog
+* Mon Feb 22 2016 Remi Collet <remi@fedoraproject.org> - 2.3.5-1
+- update to 2.3.5
+- run test suite with both PHP 7 and 7 when available
+
* Mon Nov 30 2015 Remi Collet <remi@fedoraproject.org> - 2.3.4-1
- update to 2.3.4