From b41cbded34dd1b79eb4c35af3003afea51f67010 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 Jun 2022 16:19:07 +0200 Subject: only run test suite on Fedora, not on EL --- php-nikic-php-parser4.spec | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec index 07ad602..8054d18 100644 --- a/php-nikic-php-parser4.spec +++ b/php-nikic-php-parser4.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-nikic-php-parser4 # -# Copyright (c) 2016-2021 Remi Collet +# Copyright (c) 2016-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -10,19 +10,25 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 210577fe3cf7badcc5814d99455df46564f3c077 +%if 0%{?fedora} +%bcond_without tests +%else +# disabled as phpunit not availble +%bcond_with tests +%endif + +%global gh_commit 34bea19b6e03d8153165d8f30bba4c3be86184c1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nikic %global gh_project PHP-Parser %global pk_project php-parser %global php_home %{_datadir}/php %global ns_project PhpParser -%global with_tests 0%{!?_without_tests:1} %global major 4 Name: php-%{gh_owner}-%{pk_project}%{major} -Version: 4.13.2 -Release: 1%{?dist} +Version: 4.14.0 +Release: 2%{?dist} Summary: A PHP parser written in PHP - version %{major} License: BSD @@ -34,7 +40,7 @@ Source1: makesrc.sh Patch0: %{name}-rpm.patch BuildArch: noarch -%if %{with_tests} +%if %{with tests} # For tests # as we use phpunit9 BuildRequires: php(language) >= 7.3 @@ -50,8 +56,8 @@ BuildRequires: php-spl %global phpunit %{_bindir}/phpunit9 BuildRequires: phpunit9 # Autoloader -BuildRequires: php-fedora-autoloader-devel %endif +BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { # "php": ">=7.0", @@ -105,7 +111,7 @@ install -Dpm 0755 bin/php-parse %{buildroot}%{_bindir}/php-parse%{major} %check -%if %{with_tests} +%if %{with tests} : Test the command sed -e 's:%{php_home}:%{buildroot}%{php_home}:' \ bin/php-parse > bin/php-parse-test @@ -128,7 +134,7 @@ else fi ret=0 -for cmdarg in "php %{phpunit}" php74 php80 php81; do +for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 -d include_path=%{php_home} \ @@ -153,6 +159,12 @@ exit $ret %changelog +* Mon Jun 13 2022 Remi Collet - 4.14.0-2 +- only run test suite on Fedora, not on EL + +* Wed Jun 1 2022 Remi Collet - 4.14.0-1 +- update to 4.14.0 + * Wed Dec 1 2021 Remi Collet - 4.13.2-1 - update to 4.13.2 -- cgit