diff options
| -rw-r--r-- | php-fedora-autoloader.spec | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/php-fedora-autoloader.spec b/php-fedora-autoloader.spec index c6a29c2..20998a5 100644 --- a/php-fedora-autoloader.spec +++ b/php-fedora-autoloader.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-fedora-autoloader # -# Copyright (c) 2016-2020 Shawn Iwinski <shawn@iwin.ski> +# Copyright (c) 2016-2021 Shawn Iwinski <shawn@iwin.ski> # Remi Collet <remi@fedoraproject.org> # # License: MIT @@ -33,7 +33,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 2%{?dist} +Release: 5%{?dist} Summary: Fedora Autoloader License: MIT @@ -52,7 +52,12 @@ BuildRequires: php(language) >= %{php_min_ver} %global phpunit %{_bindir}/phpunit %endif BuildRequires: %{phpunit} +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires:(php-composer(theseer/autoload) >= %{phpab_min_ver} with php-composer(theseer/autoload) < %{phpab_max_ver}) +%else +BuildRequires: php-composer(theseer/autoload) < %{phpab_max_ver} BuildRequires: php-composer(theseer/autoload) >= %{phpab_min_ver} +%endif BuildRequires: php-pear ## phpcompatinfo (computed from version 1.0.1) BuildRequires: php-ctype @@ -83,8 +88,12 @@ required and optional dependencies. Summary: %{name} devel Requires: %{name} = %{version}-%{release} -Requires: php-composer(theseer/autoload) >= %{phpab_min_ver} +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires:(php-composer(theseer/autoload) >= %{phpab_min_ver} with php-composer(theseer/autoload) < %{phpab_max_ver}) +%else Requires: php-composer(theseer/autoload) < %{phpab_max_ver} +Requires: php-composer(theseer/autoload) >= %{phpab_min_ver} +%endif %description devel Provides needed tools to build other packages: @@ -132,11 +141,11 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 -for PHP_EXEC in "php %{phpunit}" %{?rhel:php54 php55 php56 php70} "php71 %{_bindir}/phpunit7" "php72 %{_bindir}/phpunit8" "php73 %{_bindir}/phpunit8" "php74 %{_bindir}/phpunit8"; do +for PHP_EXEC in "php %{phpunit}" php73 php74 php80; do set $PHP_EXEC if [ "php" == "$1" ] || which $PHP_EXEC; then $1 -d include_path=.:%{buildroot}%{phpdir}:%{phpdir}:%{_datadir}/pear \ - ${2:-%{_bindir}/phpunit} \ + ${2:-%{_bindir}/phpunit8} \ --bootstrap bootstrap.php \ --verbose fi @@ -160,6 +169,10 @@ exit $RETURN_CODE %changelog +* Mon Mar 8 2021 Remi Collet <remi@remirepo.net> - 1.0.1-5 +- use range dependencies +- switch to phpunit8 + * Wed Feb 12 2020 Shawn Iwinski <shawn@iwin.ski> - 1.0.1-2 - Add tests bootstrap to fix EPEL6 build |