summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-11-27 16:08:49 +0100
committerRemi Collet <fedora@famillecollet.com>2016-11-27 16:08:49 +0100
commit76c185e1fb1862ef61a57e2346bb551c625d18b9 (patch)
treef16f566dba24ffb41d468b10ea27f2ec8af17aba
parent2f0d38e8c4c43ec2b4220840534883c8d4e0be4f (diff)
php-slim3: 3.6.0 (backported from Fedora)
-rw-r--r--php-slim3.spec31
1 files changed, 20 insertions, 11 deletions
diff --git a/php-slim3.spec b/php-slim3.spec
index b9a0f9d..600f192 100644
--- a/php-slim3.spec
+++ b/php-slim3.spec
@@ -7,12 +7,12 @@
#
# Please preserve changelog entries
-%global gh_commit a132385f736063d00632b52b3f8a389fe66fe4fa
+%global gh_commit a685fe91a9435e1432e8eeb7cf516e2f5cee7f64
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner slimphp
%global gh_project Slim
%global pk_project slim
-%global gh_version 3.4.2
+%global gh_version 3.6.0
%global php_home %{_datadir}/php
%global slim_home %{php_home}/Slim3
@@ -133,21 +133,27 @@ sed -e \
-e "s|\$autoloader->addPsr4.*$|require 'autoload.php';|" \
-i tests/bootstrap.php
-ret=0
-
# OK (Tests: 512, Assertions: 820, Skipped: 13)
-%{_bindir}/phpunit \
- -d memory_limit=-1 \
- tests || ret=1
-
+# remirepo:11
+run=0
+ret=0
+if which php56; then
+ php56 %{_bindir}/phpunit -d memory_limit=-1 tests || ret=1
+ run=1
+fi
if which php71; then
- php71 %{_bindir}/phpunit \
+ php71 %{_bindir}/phpunit -d memory_limit=-1 tests || ret=1
+ run=1
+fi
+if [ $run -eq 0 ]; then
+%{_bindir}/phpunit \
-d memory_limit=-1 \
- tests || ret=1
+ tests
+# remirepo:2
fi
-
exit $ret
+
%clean
rm -rf %{buildroot}
@@ -162,6 +168,9 @@ rm -rf %{buildroot}
%changelog
+* Sun Nov 27 2016 Johan Cwiklinski <Johan AT x-tnd DOT be> - 3.6.0-1
+- New upstream release
+
* Tue Jun 21 2016 Remi Collet <remi@fedoraproject.org> - 3.4.2-1
- update to 3.4.2