From 1186b050a255df55873f86fd223b88d1fe36284b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Nov 2023 08:03:07 +0100 Subject: [PATCH 1/2] v1.2.2 (cherry picked from commit c5dbdbd3eafc4c23561029da8d5522d4db4f5519) --- .gitignore | 1 + php-theseer-tokenizer.spec | 27 +++++++++++++++------------ sources | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 2c53363..9853550 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ clog /tokenizer-1.2.0-75a63c3.tar.gz /php-theseer-tokenizer-1.2.0-75a63c3.tgz /php-theseer-tokenizer-1.2.1-34a41e9.tgz +/php-theseer-tokenizer-1.2.2-b2ad500.tgz diff --git a/php-theseer-tokenizer.spec b/php-theseer-tokenizer.spec index 6a6965a..56dc7ca 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-2021 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2017-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit 34a41e998c2183e22995f158c581e7b5e755ab9e +%global gh_commit b2ad5003ca10d4ee50a12da31de12a5774ba6b96 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor theseer %global gh_project tokenizer @@ -14,11 +14,11 @@ %global ns_project Tokenizer Name: php-%{gh_vendor}-%{gh_project} -Version: 1.2.1 -Release: 4%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Summary: Library for converting tokenized PHP source code into XML -License: BSD +License: BSD-3-Clause URL: https://github.com/%{gh_vendor}/%{gh_project} Source0: %{name}-%{version}-%{?gh_short}.tgz Source1: makesrc.sh @@ -33,8 +33,7 @@ BuildRequires: php-spl # Autoloader BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # Tests -%global phpunit %{_bindir}/phpunit7 -BuildRequires: %{phpunit} +BuildRequires: phpunit9 # From composer.json, "require": { # "php": "^7.0 || ^8.0", @@ -76,11 +75,10 @@ cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project} %check ret=0 -for cmdarg in "php %{phpunit}" php73 php74 php80; do +for cmdarg in php php80 php81 php82 php83; do if which $cmdarg; then - set $cmdarg - $1 -d auto_prepend_file=%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php \ - ${2:-%{_bindir}/phpunit7} \ + $cmdarg -d auto_prepend_file=%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php \ + %{_bindir}/phpunit9 \ --no-coverage --verbose || ret=1 fi done @@ -95,6 +93,11 @@ exit $ret %changelog +* Mon Nov 20 2023 Remi Collet - 1.2.2-1 +- update to 1.2.2 +- use SPDX license ID +- switch to phpunit9 + * Fri Jan 20 2023 Fedora Release Engineering - 1.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 011333b..c626b14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-theseer-tokenizer-1.2.1-34a41e9.tgz) = 431b96ccc9755ef497eb66d543951ff48b3a766a7826f4cf9dff608bfeea3fc70584fedc59e33d3584bd7e5c6b2affa8f95622be0ac32ffa04b51d5f1fae145a +SHA512 (php-theseer-tokenizer-1.2.2-b2ad500.tgz) = 27365c4ab2e300c4d8c02bab9f9ad1cc7e6822a40d8d14e21b8479efacadc5d58ae5aa3a34eaf3a5beb6435a6cdc54f1d74bf759395e3bf9ae3942c0bd3dd61b From 46685ea431bd0d3d3a6470ab3fb6f2beb5f2c6f1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Mar 2024 10:54:37 +0100 Subject: [PATCH 2/2] v1.2.3 --- .gitignore | 1 + php-theseer-tokenizer.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9853550..081bbae 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ clog /php-theseer-tokenizer-1.2.0-75a63c3.tgz /php-theseer-tokenizer-1.2.1-34a41e9.tgz /php-theseer-tokenizer-1.2.2-b2ad500.tgz +/php-theseer-tokenizer-1.2.3-737eda6.tgz diff --git a/php-theseer-tokenizer.spec b/php-theseer-tokenizer.spec index 56dc7ca..9e77af7 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-2023 Remi Collet +# Copyright (c) 2017-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit b2ad5003ca10d4ee50a12da31de12a5774ba6b96 +%global gh_commit 737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2 %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.2.2 +Version: 1.2.3 Release: 1%{?dist} Summary: Library for converting tokenized PHP source code into XML @@ -75,7 +75,7 @@ cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project} %check ret=0 -for cmdarg in php php80 php81 php82 php83; do +for cmdarg in php php81 php82 php83; do if which $cmdarg; then $cmdarg -d auto_prepend_file=%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php \ %{_bindir}/phpunit9 \ @@ -93,6 +93,9 @@ exit $ret %changelog +* Tue Mar 5 2024 Remi Collet - 1.2.3-1 +- update to 1.2.3 + * Mon Nov 20 2023 Remi Collet - 1.2.2-1 - update to 1.2.2 - use SPDX license ID diff --git a/sources b/sources index c626b14..b645a8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-theseer-tokenizer-1.2.2-b2ad500.tgz) = 27365c4ab2e300c4d8c02bab9f9ad1cc7e6822a40d8d14e21b8479efacadc5d58ae5aa3a34eaf3a5beb6435a6cdc54f1d74bf759395e3bf9ae3942c0bd3dd61b +SHA512 (php-theseer-tokenizer-1.2.3-737eda6.tgz) = 0257d482d321600f55766abf7365d8e97ebd5b5d43dbc42d3d99f5e9abf5e36e75ec019c1e7f65120b1ac67be7464f91684cbbf97e294688748614e773c4adeb