diff --git a/.gitignore b/.gitignore index 42fa6e4..c1ddff2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /tokenizer-1.1.0-cb2f008.tar.gz +/tokenizer-1.1.1-06b6ce4.tar.gz diff --git a/php-theseer-tokenizer.spec b/php-theseer-tokenizer.spec index be9a966..31db65a 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,8 +14,8 @@ %global ns_project Tokenizer Name: php-%{gh_vendor}-%{gh_project} -Version: 1.1.0 -Release: 4%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: Library for converting tokenized PHP source code into XML Group: Development/Libraries @@ -24,7 +24,8 @@ 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 @@ -33,7 +34,7 @@ BuildRequires: php-spl # Autoloader BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # Tests -BuildRequires: phpunit6 +BuildRequires: phpunit8 # From composer.json, "require": { # "php": "^7.0", @@ -65,7 +66,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 +76,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,7 +87,6 @@ exit $ret %files -%{!?_licensedir:%global license %%doc} %license LICENSE %doc README.md composer.json %dir %{_datadir}/php/%{ns_vendor} @@ -95,6 +94,10 @@ exit $ret %changelog +* Thu Apr 4 2019 Remi Collet - 1.1.1-1 +- update to 1.1.1 +- use phpunit8 + * Fri Jul 13 2018 Fedora Release Engineering - 1.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 1e24f10..2e3fb40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tokenizer-1.1.0-cb2f008.tar.gz) = ab6a8dde2296ccf7ffda86c8906b6d546309c442611f12e87b829b44635a8cd17a6cdd834d21ba33b7f346561420739dd81cf2293ba52900f121c0c4311dbed2 +SHA512 (tokenizer-1.1.1-06b6ce4.tar.gz) = bd4a41caed3ec215a333b9dab00cfc0bcd4d89327f7a004d08dd493544379384f12ec9daa9b61b80999959354984dc61f309e8ce271bab6a3fe38b7a79310d9f