From f394564bcf88dcbffa08dede1b59b0dcf01ba91c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Feb 2018 09:46:55 +0100 Subject: v6.5.7 --- phpunit6.spec | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/phpunit6.spec b/phpunit6.spec index 16046e2..d622e31 100644 --- a/phpunit6.spec +++ b/phpunit6.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 3330ef26ade05359d006041316ed0fa9e8e3cefe +%global gh_commit 6bd77b57707c236833d2b57b968e403df060c9d9 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -24,15 +24,14 @@ %global php_home %{_datadir}/php %global ver_major 6 %global ver_minor 5 -%global ver_patch 6 -%global specrel 2 +%global ver_patch 7 +%global specrel 1 Name: %{pk_project}%{ver_major} Version: %{ver_major}.%{ver_minor}.%{ver_patch} Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: The PHP Unit Testing framework -Group: Development/Libraries License: BSD URL: https://github.com/%{gh_vendor}/%{gh_project} Source0: https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz @@ -42,6 +41,7 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.0 +# remirepo:1 %if 0%{?fedora} >= 27 BuildRequires: (php-composer(myclabs/deep-copy) >= 1.6.1 with php-composer(myclabs/deep-copy) < 2) BuildRequires: (php-composer(phar-io/manifest) >= 1.0.1 with php-composer(phar-io/manifest) < 2) @@ -52,7 +52,7 @@ BuildRequires: (php-composer(phpunit/php-file-iterator) >= 1.4.3 with php-co BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) BuildRequires: (php-composer(phpunit/php-timer) >= 1.0.9 with php-composer(phpunit/php-timer) < 2) BuildRequires: (php-composer(phpunit/phpunit-mock-objects) >= 5.0.5 with php-composer(phpunit/phpunit-mock-objects) < 6) -BuildRequires: (php-composer(sebastian/comparator) >= 2.0.2 with php-composer(sebastian/comparator) < 3) +BuildRequires: (php-composer(sebastian/comparator) >= 2.1 with php-composer(sebastian/comparator) < 3) BuildRequires: (php-composer(sebastian/diff) >= 2.0 with php-composer(sebastian/diff) < 3) BuildRequires: (php-composer(sebastian/environment) >= 3.1 with php-composer(sebastian/environment) < 4) BuildRequires: (php-composer(sebastian/exporter) >= 3.1 with php-composer(sebastian/exporter) < 4) @@ -61,6 +61,7 @@ BuildRequires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-co BuildRequires: (php-composer(sebastian/resource-operations) >= 1.0 with php-composer(sebastian/resource-operations) < 2) BuildRequires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3) BuildRequires: (php-composer(phpunit/php-invoker) < 2 with php-composer(phpunit/php-invoker) >= 1.1) +# remirepo:20 %else BuildRequires: php-myclabs-deep-copy >= 1.6.1 BuildRequires: php-phar-io-manifest >= 1.0.1 @@ -71,7 +72,7 @@ BuildRequires: php-phpunit-File-Iterator >= 1.4.3 BuildRequires: php-phpunit-Text-Template >= 1.2.1 BuildRequires: php-phpunit-PHP-Timer >= 1.0.9 BuildRequires: php-phpunit-mock-objects5 >= 5.0.5 -BuildRequires: php-sebastian-comparator2 >= 2.0.2 +BuildRequires: php-sebastian-comparator2 >= 2.1 BuildRequires: php-sebastian-diff2 BuildRequires: php-sebastian-environment3 >= 3.1 BuildRequires: php-sebastian-exporter3 >= 3.1 @@ -105,7 +106,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "phpunit/php-text-template": "^1.2.1", # "phpunit/php-timer": "^1.0.9", # "phpunit/phpunit-mock-objects": "^5.0.5", -# "sebastian/comparator": "^2.0.2", +# "sebastian/comparator": "^2.1", # "sebastian/diff": "^2.0", # "sebastian/environment": "^3.1", # "sebastian/exporter": "^3.1", @@ -120,6 +121,7 @@ Requires: php-json Requires: php-libxml Requires: php-mbstring Requires: php-xml +# remirepo:1 %if 0%{?fedora} >= 27 Requires: (php-composer(myclabs/deep-copy) >= 1.6.1 with php-composer(myclabs/deep-copy) < 2) Requires: (php-composer(phar-io/manifest) >= 1.0.1 with php-composer(phar-io/manifest) < 2) @@ -130,7 +132,7 @@ Requires: (php-composer(phpunit/php-file-iterator) >= 1.4.3 with php-co Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) Requires: (php-composer(phpunit/php-timer) >= 1.0.9 with php-composer(phpunit/php-timer) < 2) Requires: (php-composer(phpunit/phpunit-mock-objects) >= 5.0.5 with php-composer(phpunit/phpunit-mock-objects) < 6) -Requires: (php-composer(sebastian/comparator) >= 2.0.2 with php-composer(sebastian/comparator) < 3) +Requires: (php-composer(sebastian/comparator) >= 2.1 with php-composer(sebastian/comparator) < 3) Requires: (php-composer(sebastian/diff) >= 2.0 with php-composer(sebastian/diff) < 3) Requires: (php-composer(sebastian/environment) >= 3.1 with php-composer(sebastian/environment) < 4) Requires: (php-composer(sebastian/exporter) >= 3.1 with php-composer(sebastian/exporter) < 4) @@ -142,6 +144,7 @@ Requires: (php-composer(sebastian/version) >= 2.0.1 with php-co # "phpunit/php-invoker": "^1.1", # "ext-xdebug": "*" Requires: (php-composer(phpunit/php-invoker) < 2 with php-composer(phpunit/php-invoker) >= 1.1) +# remirepo:20 %else Requires: php-myclabs-deep-copy >= 1.6.1 Requires: php-phar-io-manifest >= 1.0.1 @@ -152,7 +155,7 @@ Requires: php-phpunit-File-Iterator >= 1.4.3 Requires: php-phpunit-Text-Template >= 1.2.1 Requires: php-phpunit-PHP-Timer >= 1.0.9 Requires: php-phpunit-mock-objects5 >= 5.0.5 -Requires: php-sebastian-comparator2 >= 2.0.2 +Requires: php-sebastian-comparator2 >= 2.1 Requires: php-sebastian-diff2 Requires: php-sebastian-environment3 >= 3.1 Requires: php-sebastian-exporter3 >= 3.1 @@ -171,20 +174,13 @@ Requires: php-pcntl Requires: php-pcre Requires: php-phar Requires: php-spl +# remirepo:1 %if 0%{?fedora} > 21 Recommends: php-phpunit-dbunit3 Suggests: php-phpunit-selenium +# remirepo:1 %endif -%if 0%{?fedora} > 99 -%global single 1 -Obsoletes: php-phpunit-PHPUnit < %{ver_major} -Provides: php-phpunit-PHPUnit = %{version} -Provides: %{pk_project} = %{version} -Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} -%else -%global single 0 -%endif %description PHPUnit is a programmer-oriented testing framework for PHP. @@ -244,9 +240,6 @@ mkdir -p %{buildroot}%{php_home} cp -pr src %{buildroot}%{php_home}/%{ns_vendor} install -D -p -m 755 phpunit %{buildroot}%{_bindir}/%{name} -%if %{single} -ln -s %{name} %{buildroot}%{_bindir}/phpunit -%endif %check @@ -268,13 +261,13 @@ exit $ret %doc README.md ChangeLog-%{ver_major}.%{ver_minor}.md %doc composer.json %{_bindir}/%{name} -%if %{single} -%{_bindir}/phpunit -%endif %{php_home}/%{ns_vendor} %changelog +* Mon Feb 26 2018 Remi Collet - 6.5.7-1 +- Update to 6.5.7 + * Fri Feb 2 2018 Remi Collet - 6.5.6-2 - use package names on EL and Fedora < 27 -- cgit