summaryrefslogtreecommitdiffstats
path: root/php-jsonlint.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php-jsonlint.spec')
-rw-r--r--php-jsonlint.spec34
1 files changed, 13 insertions, 21 deletions
diff --git a/php-jsonlint.spec b/php-jsonlint.spec
index 2d52bac..61fb288 100644
--- a/php-jsonlint.spec
+++ b/php-jsonlint.spec
@@ -13,8 +13,8 @@
%global github_owner Seldaek
%global github_name jsonlint
-%global github_version 1.6.0
-%global github_commit 791f8c594f300d246cdf01c6b3e1e19611e301d8
+%global github_version 1.6.1
+%global github_commit 50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77
# "php": "^5.3 || ^7.0"
%global php_min_ver 5.3
@@ -35,7 +35,6 @@ Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{githu
# Bin usage without Composer autoloader
Patch0: %{name}-bin-without-composer-autoloader.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
%if %{with_tests}
# For tests: composer.json
@@ -101,23 +100,13 @@ install -pm 0755 bin/jsonlint %{buildroot}%{_bindir}/jsonlint-php
%check
%if %{with_tests}
-# remirepo:11
-run=0
ret=0
-if which php56; then
- php56 %{_bindir}/phpunit --bootstrap %{buildroot}%{_datadir}/php/Seld/JsonLint/autoload.php || ret=1
- run=1
-fi
-if which php71; then
- php71 %{_bindir}/phpunit --bootstrap %{buildroot}%{_datadir}/php/Seld/JsonLint/autoload.php || ret=1
- run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/phpunit \
- --bootstrap %{buildroot}%{_datadir}/php/Seld/JsonLint/autoload.php \
- --verbose
-# remirepo:2
-fi
+for cmd in php php56 php70 php71 php72; do
+ if which $cmd; then
+ $cmd %{_bindir}/phpunit --bootstrap %{buildroot}%{_datadir}/php/Seld/JsonLint/autoload.php \
+ --verbose || ret=1
+ fi
+done
exit $ret
%else
: Tests skipped
@@ -125,16 +114,19 @@ exit $ret
%files
-%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc}
%license LICENSE
-%doc *.mdown composer.json
+%doc *.mdown *md
+%doc composer.json
%dir %{_datadir}/php/Seld
%{_datadir}/php/Seld/JsonLint
%{_bindir}/jsonlint-php
%changelog
+* Mon Jun 19 2017 Remi Collet <remi@remirepo.net> - 1.6.1-1
+- Update to 1.6.1
+
* Tue Mar 7 2017 Remi Collet <remi@remirepo.net> - 1.6.0-1
- Update to 1.6.0
- generate autoloader in spec