From ae9a3869248884f21894b763a58430ac57fbec87 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 Aug 2020 14:11:35 +0200 Subject: update to 7.0.0 sources from git snapshot add dependency on sebastian/cli-parser add dependency on phpunit/php-file-iterator drop depency on sebastian/finder-facade drop depency on symfony/console --- php-phpunit-phploc.spec | 75 ++++++++++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 32 deletions(-) (limited to 'php-phpunit-phploc.spec') diff --git a/php-phpunit-phploc.spec b/php-phpunit-phploc.spec index e99aa56..f13ebb0 100644 --- a/php-phpunit-phploc.spec +++ b/php-phpunit-phploc.spec @@ -8,26 +8,31 @@ # Please, preserve the changelog entries # +%bcond_without tests + # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 00e3bade7b22a6f23b17c3bf2fa4dba24ead8a29 +%global gh_commit 9f307141df2d7698fc6d42999411e2dd147ca817 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phploc -%global php_home %{_datadir}/php/SebastianBergmann +%global php_home %{_datadir}/php %global pear_name phploc %global pear_channel pear.phpunit.de -%global with_tests %{?_without_tests:0}%{!?_without_tests:1} +# Namespace +%global ns_vendor SebastianBergmann +%global ns_project PHPLOC Name: php-phpunit-phploc -Version: 6.0.2 +Version: 7.0.0 Release: 1%{?dist} Summary: A tool for quickly measuring the size of a PHP project License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz +Source0: %{name}-%{version}-%{gh_short}.tgz +Source1: makesrc.sh # Fix for RPM, use autoload Patch0: %{gh_project}-rpm.patch @@ -35,23 +40,23 @@ Patch0: %{gh_project}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.3 BuildRequires: php-fedora-autoloader-devel -%if %{with_tests} +%if %{with tests} BuildRequires: php-dom BuildRequires: php-json BuildRequires: php-spl BuildRequires: php-tokenizer # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(sebastian/finder-facade) >= 2.0 with php-composer(sebastian/finder-facade) < 3) -BuildRequires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4) -BuildRequires: (php-composer(symfony/console) >= 4.0 with php-composer(symfony/console) < 6) +BuildRequires: (php-composer(sebastian/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) +BuildRequires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4) # remirepo:5 %else -BuildRequires: php-sebastian-finder-facade2 +BuildRequires: php-sebastian-cli-parser BuildRequires: php-sebastian-version3 -BuildRequires: php-symfony4-console +BuildRequires: php-phpunit-php-file-iterator3 %endif -%global phpunit %{_bindir}/phpunit8 +%global phpunit %{_bindir}/phpunit9 BuildRequires: %{phpunit} %endif @@ -68,16 +73,16 @@ Requires: php-dom Requires: php-json # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(sebastian/finder-facade) >= 2.0 with php-composer(sebastian/finder-facade) < 3) -Requires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4) -Requires: (php-composer(symfony/console) >= 4.0 with php-composer(symfony/console) < 6) +Requires: (php-composer(sebastian/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) +Requires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4) +Requires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4) # remirepo:5 %else -Requires: php-sebastian-finder-facade2 +Requires: php-sebastian-cli-parser Requires: php-sebastian-version3 -Requires: php-symfony4-console +Requires: php-phpunit-php-file-iterator3 %endif -# From phpcompatinfo report for version 6.0.2 +# From phpcompatinfo report for version 7.0.0 Requires: php-spl Requires: php-tokenizer # For our autoloader @@ -112,33 +117,31 @@ need to get a quick understanding of a project's size. cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ - '%{_datadir}/php/SebastianBergmann/FinderFacade2/autoload.php', - '%{_datadir}/php/SebastianBergmann/Version3/autoload.php', - '%{_datadir}/php/TheSeer/fDOMDocument/autoload.php', - [ - '%{_datadir}/php/Symfony5/Component/Console/autoload.php', - '%{_datadir}/php/Symfony4/Component/Console/autoload.php', - ], + '%{php_home}/%{ns_vendor}/CliParser/autoload.php', + '%{php_home}/%{ns_vendor}/FileIterator3/autoload.php', + '%{php_home}/%{ns_vendor}/Version3/autoload.php', ]); EOF %install -mkdir -p %{buildroot}%{php_home} -cp -pr src %{buildroot}%{php_home}/PHPLOC +mkdir -p %{buildroot}%{php_home}/%{ns_vendor} +cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project} install -D -p -m 755 phploc %{buildroot}%{_bindir}/phploc -%if %{with_tests} +%if %{with tests} %check +mkdir vendor +ln -s %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php vendor/autoload.php + ret=0 -for cmd in "php %{phpunit}" php73 php74; do +for cmd in "php %{phpunit}" php73 php74 php80; do if which $cmd; then set $cmd $1 ${2:-%{_bindir}/phpunit9} \ - --bootstrap %{buildroot}%{php_home}/PHPLOC/autoload.php \ - --verbose tests || ret=1 + --verbose || ret=1 fi done exit $ret @@ -158,11 +161,19 @@ fi %license LICENSE %doc README.md %doc composer.json -%{php_home}/PHPLOC +%{php_home}/%{ns_vendor}/%{ns_project} %{_bindir}/phploc %changelog +* Thu Aug 13 2020 Remi Collet - 7.0.0-1 +- update to 7.0.0 +- sources from git snapshot +- add dependency on sebastian/cli-parser +- add dependency on phpunit/php-file-iterator +- drop depency on sebastian/finder-facade +- drop depency on symfony/console + * Fri Feb 28 2020 Remi Collet - 6.0.2-1 - update to 6.0.2 -- cgit