From e4a55527b5fb06161a6be4269881e79cc265ee3c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 20 Feb 2019 09:27:14 +0100 Subject: cleanup for EL-8 --- php-phpunit-FinderFacade.spec | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/php-phpunit-FinderFacade.spec b/php-phpunit-FinderFacade.spec index ccfa80a..862b7a5 100644 --- a/php-phpunit-FinderFacade.spec +++ b/php-phpunit-FinderFacade.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-phpunit-FinderFacade # -# Copyright (c) 2012-2018 Remi Collet +# Copyright (c) 2012-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -17,10 +17,9 @@ Name: php-phpunit-FinderFacade Version: 1.2.2 -Release: 2%{?dist} +Release: 5%{?dist} Summary: Wrapper for Symfony Finder component -Group: Development/Libraries 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 @@ -30,7 +29,7 @@ BuildRequires: php(language) >= 5.3.3 BuildRequires: php-fedora-autoloader-devel %if %{with_tests} BuildRequires: %{_bindir}/phpunit -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(theseer/fdomdocument) >= 1.3 with php-composer(theseer/fdomdocument) < 2) BuildRequires: (php-composer(symfony/finder) >= 2.3 with php-composer(symfony/finder) < 5) %else @@ -43,7 +42,7 @@ BuildRequires: php-symfony-finder # "theseer/fdomdocument": "~1.3", # "symfony/finder": "~2.3|~3.0|~4.0" Requires: php(language) >= 5.3.3 -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(theseer/fdomdocument) >= 1.3 with php-composer(theseer/fdomdocument) < 2) Requires: (php-composer(symfony/finder) >= 2.3 with php-composer(symfony/finder) < 5) %else @@ -71,7 +70,7 @@ Convenience wrapper for Symfony's Finder component. %build phpab \ --output src/autoload.php \ - --template fedora2 \ + --template fedora \ src cat << 'EOF' | tee -a src/autoload.php @@ -96,7 +95,7 @@ cp -pr src %{buildroot}%{php_home}/SebastianBergmann/FinderFacade php -r 'require "%{buildroot}%{php_home}/SebastianBergmann/FinderFacade/autoload.php";' ret=0 -for cmd in php php70 php71 php72; do +for cmd in php php70 php71 php72 php73; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/SebastianBergmann/FinderFacade/autoload.php \ %{_bindir}/phpunit --verbose tests || ret=1 @@ -123,6 +122,9 @@ fi %changelog +* Wed Feb 20 2019 Remi Collet - 1.2.2-5 +- cleanup for EL-8 + * Tue Feb 6 2018 Remi Collet - 1.2.2-2 - use range dependencies on F27+ -- cgit