update to 1.1.1

use phpunit8

1 files changed, 16 insertions, 12 deletions

diff --git a/php-theseer-tokenizer.spec b/php-theseer-tokenizer.spec
index a80aa9e..5037b68 100644
--- a/php-theseer-tokenizer.spec
+++ b/php-theseer-tokenizer.spec
@@ -1,12 +1,12 @@
 # remirepo/fedora spec file for php-theseer-tokenizer
 #
-# Copyright (c) 2017 Remi Collet
+# Copyright (c) 2017-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    cb2f008f3f05af2893a87208fe6a6c4985483f8b
+%global gh_commit    06b6ce404ee574e9c1787fb67bb9980ca4387c34
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_vendor    theseer
 %global gh_project   tokenizer
@@ -14,26 +14,26 @@
 %global ns_project   Tokenizer
 
 Name:           php-%{gh_vendor}-%{gh_project}
-Version:        1.1.0
+Version:        1.1.1
 Release:        1%{?dist}
 Summary:        Library for converting tokenized PHP source code into XML
 
-Group:          Development/Libraries
 License:        BSD
 URL:            https://github.com/%{gh_vendor}/%{gh_project}
 Source0:        https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{?gh_short}.tar.gz
 
 BuildArch:      noarch
-BuildRequires:  php(language) >= 7.0
+# Because of phpunit8
+BuildRequires:  php(language) >= 7.2
 BuildRequires:  php-xmlwriter
 BuildRequires:  php-dom
 BuildRequires:  php-tokenizer
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # Autoloader
-BuildRequires:  php-fedora-autoloader-devel
+BuildRequires:  php-fedora-autoloader-devel >= 1.0.0
 # Tests
-BuildRequires:  phpunit6
+BuildRequires:  phpunit8
 
 # From composer.json, "require": {
 #    "php": "^7.0",
@@ -48,7 +48,7 @@ Requires:       php-tokenizer
 Requires:       php-pcre
 Requires:       php-spl
 # Autoloader
-Requires:       php-composer(fedora/autoloader) >= 1.0.0
+Requires:       php-composer(fedora/autoloader)
 
 Provides:       php-composer(%{gh_vendor}/%{gh_project}) = %{version}
 
@@ -65,7 +65,7 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php
 
 %build
 : Generate a simple classmap autoloader
-%{_bindir}/phpab --template fedora2 --output src/autoload.php src
+%{_bindir}/phpab --template fedora --output src/autoload.php src
 
 
 %install
@@ -75,10 +75,9 @@ cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}
 
 %check
 ret=0
-for cmd in php php70 php71 php72; do
+for cmd in php php72 php73; do
   if which $cmd; then
-    $cmd -d include_path=.:%{buildroot}%{php_home}:%{php_home} \
-      %{_bindir}/phpunit6 \
+      $cmd %{_bindir}/phpunit8 \
         --bootstrap %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php \
         --no-coverage --verbose || ret=1
   fi
@@ -87,6 +86,7 @@ exit $ret
 
 
 %files
+# remirepo:1
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc README.md composer.json
@@ -95,5 +95,9 @@ exit $ret
 
 
 %changelog
+* Thu Apr  4 2019 Remi Collet <remi@remirepo.net> - 1.1.1-1
+- update to 1.1.1
+- use phpunit8
+
 * Fri Apr 21 2017 Remi Collet <remi@remirepo.net> - 1.1.0-1
 - initial package, version 1.1.0