From b9aaf1873cbec4be110492b370bf628bb3c7f706 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 2 Apr 2017 18:08:53 +0200 Subject: switch the specs --- php-phpunit-PHP-CodeCoverage.spec | 223 ++++++++++++++++++++++++++++++-------- 1 file changed, 179 insertions(+), 44 deletions(-) (limited to 'php-phpunit-PHP-CodeCoverage.spec') diff --git a/php-phpunit-PHP-CodeCoverage.spec b/php-phpunit-PHP-CodeCoverage.spec index 35a4f16..5454f5e 100644 --- a/php-phpunit-PHP-CodeCoverage.spec +++ b/php-phpunit-PHP-CodeCoverage.spec @@ -8,22 +8,26 @@ # %global bootstrap 0 -%global gh_commit eabf68b476ac7d0f73793aada060f1c1a9bf8979 +%global gh_commit 09e2277d14ea467e5a984010f501343ef29ffc69 +#global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-code-coverage %global php_home %{_datadir}/php %global pear_name PHP_CodeCoverage %global pear_channel pear.phpunit.de +%global major 4.0 +%global minor 7 +%global specrel 1 %if %{bootstrap} -%global with_tests %{?_with_tests:1}%{!?_with_tests:0} +%global with_tests 0%{?_with_tests:1} %else -%global with_tests %{?_without_tests:0}%{!?_without_tests:1} +%global with_tests 0%{!?_without_tests:1} %endif Name: php-phpunit-PHP-CodeCoverage -Version: 2.2.4 -Release: 1%{?dist} +Version: %{major}.%{minor} +Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: PHP code coverage information Group: Development/Libraries @@ -31,51 +35,55 @@ License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz -# Autoload template from version 1.2 -Source1: Autoload.php.in - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: php(language) >= 5.3.3 -BuildRequires: php-theseer-autoload >= 1.19 +BuildRequires: php(language) >= 5.6 +BuildRequires: php-fedora-autoloader-devel %if %{with_tests} # From composer.json, "require-dev": { -# "phpunit/phpunit": "~4", -# "ext-xdebug": ">=2.1.4" -BuildRequires: php-composer(phpunit/phpunit) >= 4 -BuildRequires: php-composer(sebastian/environment) >= 1.3 -BuildRequires: php-pecl-xdebug >= 2.1.4 +# "phpunit/phpunit": "^5.7", +# "ext-xdebug": "^2.1.4" +BuildRequires: php-composer(phpunit/phpunit) >= 5.7 +BuildRequires: php-composer(sebastian/code-unit-reverse-lookup) >= 1 +BuildRequires: php-composer(sebastian/environment) >= 1.3.2 +BuildRequires: php-pecl-xdebug >= 2.4.0 %endif # From composer.json, require -# "php": ">=5.3.3", -# "phpunit/php-file-iterator": "~1.3", -# "phpunit/php-token-stream": "~1.3", -# "phpunit/php-text-template": "~1.2", -# "sebastian/environment": "^1.3.2", -# "sebastian/version": "~1.0" -Requires: php(language) >= 5.3.3 +# "php": "^5.6 || ^7.0", +# "ext-dom": "*", +# "ext-xmlwriter": "*" +# "phpunit/php-file-iterator": "^1.3", +# "phpunit/php-token-stream": "^1.4.2 || ^2.0", +# "phpunit/php-text-template": "^1.2", +# "sebastian/code-unit-reverse-lookup": "^1.0", +# "sebastian/environment": "^1.3.2 || ^2.0", +# "sebastian/version": "^1.0 || ^2.0" +Requires: php(language) >= 5.6 +Requires: php-dom +Requires: php-xmlwriter Requires: php-composer(phpunit/php-file-iterator) >= 1.3 Requires: php-composer(phpunit/php-file-iterator) < 2 -Requires: php-composer(phpunit/php-token-stream) >= 1.3 -Requires: php-composer(phpunit/php-token-stream) < 2 +Requires: php-composer(phpunit/php-token-stream) >= 1.4.2 +Requires: php-composer(phpunit/php-token-stream) < 3 Requires: php-composer(phpunit/php-text-template) >= 1.2 Requires: php-composer(phpunit/php-text-template) < 2 +Requires: php-composer(sebastian/code-unit-reverse-lookup) >= 1 +Requires: php-composer(sebastian/code-unit-reverse-lookup) < 2 Requires: php-composer(sebastian/environment) >= 1.3.2 -Requires: php-composer(sebastian/environment) < 2 +Requires: php-composer(sebastian/environment) < 3 Requires: php-composer(sebastian/version) >= 1.0 -Requires: php-composer(sebastian/version) < 2 +Requires: php-composer(sebastian/version) < 3 # From composer.json, suggest -# "ext-dom": "*", -# "ext-xdebug": ">=2.2.1", -# "ext-xmlwriter": "*" -Requires: php-dom -Requires: php-xmlwriter -# From phpcompatinfo report for version 2.2.0 +# "ext-xdebug": "^2.5.1", +# From phpcompatinfo report for version 4.0.4 +Requires: php-reflection Requires: php-date Requires: php-json Requires: php-spl Requires: php-tokenizer +# Autoloader +Requires: php-composer(fedora/autoloader) Provides: php-composer(phpunit/php-code-coverage) = %{version} @@ -93,28 +101,65 @@ for PHP code coverage information. %build -phpab \ - --output src/CodeCoverage/Autoload.php \ - --template %{SOURCE1} \ +%{_bindir}/phpab \ + --template fedora \ + --output src/autoload.php \ src +cat << 'EOF' | tee -a src/autoload.php +// Dependencies +require_once 'File/Iterator/Autoload.php'; +require_once 'PHP/Token/Stream/Autoload.php'; +require_once 'Text/Template/Autoload.php'; +require_once 'SebastianBergmann/CodeUnitReverseLookup/autoload.php'; +require_once 'SebastianBergmann/Environment/autoload.php'; +require_once 'SebastianBergmann/Version/autoload.php'; +EOF + %install rm -rf %{buildroot} # Restore PSR-0 tree -mkdir -p %{buildroot}%{php_home} -cp -pr src %{buildroot}%{php_home}/PHP +mkdir -p %{buildroot}%{php_home}/SebastianBergmann +cp -pr src %{buildroot}%{php_home}/SebastianBergmann/CodeCoverage %if %{with_tests} %check -sed -e '/log/d' phpunit.xml.dist >phpunit.xml +if ! php -v | grep Xdebug +then EXT="-d zend_extension=xdebug.so" +fi -%{_bindir}/php \ +cat << 'EOF' | tee tests/bootstrap.php + - 2.2.4-1 -- update to 2.2.4 +* Wed Mar 1 2017 Remi Collet - 4.0.7-1 +- Update to 4.0.7 + +* Thu Feb 23 2017 Remi Collet - 4.0.6-1 +- Update to 4.0.6 +- drop patch merged upstream + +* Sun Jan 22 2017 Remi Collet - 4.0.5-2 +- Update to 4.0.5 +- add upstream patch for test suite to fix + https://github.com/sebastianbergmann/php-code-coverage/issues/495 +- open https://github.com/sebastianbergmann/php-code-coverage/pull/504 + +* Fri Jan 20 2017 Remi Collet - 4.0.5-1 +- Update to 4.0.5 + +* Wed Dec 21 2016 Remi Collet - 4.0.4-1 +- Update to 4.0.4 +- ignore test suite for now + https://github.com/sebastianbergmann/php-code-coverage/issues/495 + +* Mon Nov 28 2016 Remi Collet - 4.0.3-1 +- Update to 4.0.3 + +* Wed Nov 23 2016 Remi Collet - 4.0.2-2 +- set serialize_precision=14 for the test suite + to fix FTBFS with PHP 7.1 + +* Tue Nov 1 2016 Remi Collet - 4.0.2-1 +- Update to 4.0.2 +- switch to fedora-autoloader + +* Tue Jul 26 2016 Remi Collet - 4.0.1-1 +- Update to 4.0.1 + +* Fri Jun 3 2016 Remi Collet - 4.0.0-1 +- Update to 4.0.0 +- namespace changed from PHP to SebastianBergmann +- raise build dependency on phpunit >= 5.4 + +* Sat May 28 2016 Remi Collet - 3.3.3-1 +- Update to 3.3.3 + +* Wed May 25 2016 Remi Collet - 3.3.2-1 +- Update to 3.3.2 + +* Wed May 4 2016 Remi Collet - 3.3.1-2 +- add upstream patch for environment 1.3.6 + https://github.com/sebastianbergmann/php-code-coverage/pull/435 + +* Fri Apr 8 2016 Remi Collet - 3.3.1-1 +- Update to 3.3.1 + +* Thu Mar 3 2016 Remi Collet - 3.3.0-1 +- Update to 3.3.0 + +* Thu Feb 18 2016 Remi Collet - 3.2.1-1 +- Update to 3.2.1 +- raise dependency on php-token-stream >= 1.4.2 + +* Sat Feb 13 2016 Remi Collet - 3.2.0-1 +- Update to 3.2.0 +- add dependency on sebastian/code-unit-reverse-lookup + +* Thu Feb 4 2016 Remi Collet - 3.1.1-1 +- Update to 3.1.1 +- allow sebastian/version ~2.0 +- drop autoloader template + +* Mon Jan 11 2016 Remi Collet - 3.1.0-1 +- Update to 3.1.0 + +* Fri Nov 13 2015 Remi Collet - 3.0.2-1 +- Update to 3.0.2 +- run test suite with both PHP 5 and 7 when available + +* Wed Oct 7 2015 Remi Collet - 3.0.1-1 +- Update to 3.0.1 + +* Fri Oct 2 2015 Remi Collet - 3.0.0-1 +- Update to 3.0.0 + +* Fri Oct 2 2015 Remi Collet - 3.0.0-0 +- Update to 3.0.0, boostrap build + +* Mon Sep 14 2015 Remi Collet - 3.0.0-0.1.20150924git12259bb +- rebuild (not boostrap) + +* Mon Sep 14 2015 Remi Collet - 3.0.0-0.0.20150924git12259bb +- update to 3.0.0-dev +- raise dependency on PHP >= 5.6 +- bootstrap build * Mon Sep 14 2015 Remi Collet - 2.2.3-1 - update to 2.2.3 -- cgit