From 435c34afe8f4a2993a3c97caf63c1fa5398b2de5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 Apr 2019 10:11:33 +0200 Subject: [PATCH 1/2] update to 1.1.1 use phpunit8 (cherry picked from commit 4d2f5e4796fe91e2687155a5149a8c79c81d64f2) (cherry picked from commit 57dbdb2cfab73edfe8ba29a02fbe2e8bced496c2) --- .gitignore | 1 + php-theseer-tokenizer.spec | 25 ++++++++++++++----------- sources | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) 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 693cf8f..74001b9 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: 3%{?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 Feb 09 2018 Fedora Release Engineering - 1.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 From 0988854677a42c21736182975526bc3214bc535b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 Apr 2019 12:51:50 +0200 Subject: [PATCH 2/2] update to 1.1.2 (no change) switch back to phpunit 7 (cherry picked from commit 02cf5aa6a448ece6a55951d472705538115de84c) (cherry picked from commit f6e21c3b759b38bf1a7064c0ba2dd2f4b1985a21) --- .gitignore | 3 ++- php-theseer-tokenizer.spec | 25 +++++++++++++++---------- sources | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index c1ddff2..0bea09d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -/tokenizer-1.1.0-cb2f008.tar.gz +clog /tokenizer-1.1.1-06b6ce4.tar.gz +/tokenizer-1.1.2-1c42705.tar.gz diff --git a/php-theseer-tokenizer.spec b/php-theseer-tokenizer.spec index 74001b9..1c9f656 100644 --- a/php-theseer-tokenizer.spec +++ b/php-theseer-tokenizer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 06b6ce404ee574e9c1787fb67bb9980ca4387c34 +%global gh_commit 1c42705be2b6c1de5904f8afacef5895cab44bf8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor theseer %global gh_project tokenizer @@ -14,7 +14,7 @@ %global ns_project Tokenizer Name: php-%{gh_vendor}-%{gh_project} -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} Summary: Library for converting tokenized PHP source code into XML @@ -24,8 +24,7 @@ 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 -# Because of phpunit8 -BuildRequires: php(language) >= 7.2 +BuildRequires: php(language) >= 7.0 BuildRequires: php-xmlwriter BuildRequires: php-dom BuildRequires: php-tokenizer @@ -34,7 +33,8 @@ BuildRequires: php-spl # Autoloader BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # Tests -BuildRequires: phpunit8 +%global phpunit %{_bindir}/phpunit7 +BuildRequires: %{phpunit} # From composer.json, "require": { # "php": "^7.0", @@ -76,11 +76,12 @@ cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project} %check ret=0 -for cmd in php php72 php73; do - if which $cmd; then - $cmd %{_bindir}/phpunit8 \ - --bootstrap %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php \ - --no-coverage --verbose || ret=1 +for cmdarg in "php %{phpunit}" php71 php72 php73; do + if which $cmdarg; then + set $cmdarg + $1 -d auto_prepend_file=%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php \ + ${2:-%{_bindir}/phpunit7} \ + --no-coverage --verbose || ret=1 fi done exit $ret @@ -94,6 +95,10 @@ exit $ret %changelog +* Thu Apr 4 2019 Remi Collet - 1.1.2-1 +- update to 1.1.2 (no change) +- switch back to phpunit 7 + * Thu Apr 4 2019 Remi Collet - 1.1.1-1 - update to 1.1.1 - use phpunit8 diff --git a/sources b/sources index 2e3fb40..1683852 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tokenizer-1.1.1-06b6ce4.tar.gz) = bd4a41caed3ec215a333b9dab00cfc0bcd4d89327f7a004d08dd493544379384f12ec9daa9b61b80999959354984dc61f309e8ce271bab6a3fe38b7a79310d9f +SHA512 (tokenizer-1.1.2-1c42705.tar.gz) = d0dd5e44d01327460fe583157842dec9d5a7202b656ddaf4fa59e5c13e47fa604959fe21a6e8eb7de00d0276d132ac94a33885057b03072be9a752ae8275e4d1