From 8958b84aa4e744d1e287b0d11820108d70d9d7c9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 6 Dec 2018 10:43:37 +0100 Subject: cleanup for EL-8 --- php-fedora-autoloader.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/php-fedora-autoloader.spec b/php-fedora-autoloader.spec index d7f9168..9a82263 100644 --- a/php-fedora-autoloader.spec +++ b/php-fedora-autoloader.spec @@ -33,7 +33,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?dist} +Release: 5%{?dist} Summary: Fedora Autoloader Group: Development/Libraries @@ -47,7 +47,7 @@ BuildArch: noarch BuildRequires: php-cli ## composer.json BuildRequires: php(language) >= %{php_min_ver} -%if 0%{?fedora} >= 26 +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 %global phpunit %{_bindir}/phpunit6 %else %global phpunit %{_bindir}/phpunit @@ -123,7 +123,7 @@ cp -p res/phpab/fedora*.php.tpl %{buildroot}%{phpab_template_dir}/ %check %if %{with_tests} RETURN_CODE=0 -for PHP_EXEC in "php %{phpunit}" %{?rhel:php54 php55} php56 php70 "php71 %{_bindir}/phpunit6" "php72 %{_bindir}/phpunit6"; do +for PHP_EXEC in "php %{phpunit}" %{?rhel:php54 php55 php56} php70 "php71 %{_bindir}/phpunit6" "php72 %{_bindir}/phpunit6" "php73 %{_bindir}/phpunit6"; do set $PHP_EXEC if [ "php" == "$1" ] || which $PHP_EXEC; then $1 -d include_path=.:%{buildroot}%{phpdir}:%{phpdir}:%{_datadir}/pear \ @@ -151,6 +151,9 @@ exit $RETURN_CODE %changelog +* Tue Dec 4 2018 Remi Collet - 1.0.0-5 +- cleanup for EL-8 + * Thu May 04 2017 Shawn Iwinski - 1.0.0-1 - Update to 1.0.0 -- cgit