v1.6.6

1 files changed, 10 insertions, 18 deletions

diff --git a/php-tecnickcom-tc-lib-unicode-data.spec b/php-tecnickcom-tc-lib-unicode-data.spec
index 0ce6160..f4e270e 100644
--- a/php-tecnickcom-tc-lib-unicode-data.spec
+++ b/php-tecnickcom-tc-lib-unicode-data.spec
@@ -1,12 +1,12 @@
 # remirepo/fedora spec file for php-tecnickcom-tc-lib-unicode-data
 #
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    f401208fc32b2856ecf21b666cc221c847019f78
+%global gh_commit    4e4fb6386190d20672a2cd303af07b385fe02e3c
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global c_vendor     tecnickcom
 %global gh_owner     tecnickcom
@@ -15,7 +15,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        1.6.5
+Version:        1.6.6
 Release:        1%{?dist}
 Summary:        PHP library containing UTF-8 font definitions
 
@@ -24,7 +24,6 @@ License:        LGPLv3+
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{?gh_short}.tar.gz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 %if %{with_tests}
 # For tests
@@ -64,7 +63,6 @@ grep -q '^%{version}$' VERSION
 
 
 %install
-rm -rf     %{buildroot}
 mkdir -p   $(dirname %{buildroot}%{php_project})
 cp -pr src %{buildroot}%{php_project}
 cp -p  resources/autoload.php \
@@ -80,14 +78,10 @@ require '%{buildroot}%{php_project}/autoload.php';
 EOF
 
 ret=0
-for cmd in php56 php; do
-   if which $cmd; then
-      $cmd %{_bindir}/phpunit --no-coverage --verbose || ret=1
-   fi
-done
-for cmd in php70 php71; do
-   if which $cmd; then
-      $cmd %{_bindir}/phpunit6 --no-coverage --verbose || ret=1
+for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do
+   if which $cmdarg; then
+      set $cmdarg
+      $1 ${2:-%{_bindir}/phpunit6} --no-coverage --verbose || ret=1
    fi
 done
 exit $ret
@@ -96,12 +90,7 @@ exit $ret
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc composer.json
@@ -113,6 +102,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jan  2 2018 Remi Collet <remi@remirepo.net> - 1.6.6-1
+- Update to 1.6.6 (no change)
+
 * Sun Feb 12 2017 Remi Collet <remi@remirepo.net> - 1.6.5-1
 - update to 1.6.5 (no change)