From c457f9fa8d32ad4285510759595e15d32639af8e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 7 Feb 2018 15:40:47 +0100 Subject: cleanup --- phpunit7.spec | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/phpunit7.spec b/phpunit7.spec index b985365..45389da 100644 --- a/phpunit7.spec +++ b/phpunit7.spec @@ -8,6 +8,9 @@ # Please, preserve the changelog entries # +# For compatibility with SCL +%undefine __brp_mangle_shebangs + %global gh_commit 9b3373439fdf2f3e9d1578f5e408a3a0d161c3bc #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) @@ -22,14 +25,13 @@ %global ver_major 7 %global ver_minor 0 %global ver_patch 0 -%global specrel 2 +%global specrel 3 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 @@ -39,6 +41,7 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.1 +# 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) @@ -58,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.0 with php-composer(phpunit/php-invoker) < 3) +# remirepo:20 %else BuildRequires: php-myclabs-deep-copy >= 1.6.1 BuildRequires: php-phar-io-manifest >= 1.0.1 @@ -117,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) @@ -139,6 +144,7 @@ Requires: (php-composer(sebastian/version) >= 2.0.1 with php-co # "phpunit/php-invoker": "^2.0", # "ext-xdebug": "*" Requires: (php-composer(phpunit/php-invoker) >= 2.0 with php-composer(phpunit/php-invoker) < 3) +# remirepo:20 %else Requires: php-myclabs-deep-copy >= 1.6.1 Requires: php-phar-io-manifest >= 1.0.1 @@ -168,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. @@ -241,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 @@ -266,13 +262,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 +* Wed Feb 7 2018 Remi Collet - 7.0.0-3 +- re add undefine __brp_mangle_shebangs + * Tue Feb 6 2018 Remi Collet - 7.0.0-2 - remove undefine __brp_mangle_shebangs for review #1541346 -- cgit