diff options
| -rw-r--r-- | php-PhpCollection.spec | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/php-PhpCollection.spec b/php-PhpCollection.spec index a434f86..903f804 100644 --- a/php-PhpCollection.spec +++ b/php-PhpCollection.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-PhpCollection # -# Copyright (c) 2013-2017 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2013-2021 Shawn Iwinski <shawn.iwinski@gmail.com> # # License: MIT # http://opensource.org/licenses/MIT @@ -12,8 +12,8 @@ %global github_owner schmittjoh %global github_name php-collection -%global github_version 0.5.0 -%global github_commit f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6 +%global github_version 0.6.0 +%global github_commit 56d18c8c2c0400f2838703246ac7de919a605763 %global composer_vendor phpcollection %global composer_project phpcollection @@ -30,7 +30,7 @@ Name: php-PhpCollection Version: %{github_version} -Release: 4%{?dist} +Release: 1%{?dist} Summary: General purpose collection library for PHP Group: Development/Libraries @@ -45,10 +45,16 @@ Source1: %{name}-get-source.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php-composer(phpunit/phpunit) +BuildRequires: phpunit9 ## composer.json +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires:(php-composer(phpoption/phpoption) >= %{phpoption_min_ver} with php-composer(phpoption/phpoption) < %{phpoption_max_ver}) +# remirepo:4 +%else BuildRequires: php-composer(phpoption/phpoption) < %{phpoption_max_ver} BuildRequires: php-composer(phpoption/phpoption) >= %{phpoption_min_ver} +%endif ## phpcompatinfo (computed from version 0.5.0) BuildRequires: php(language) >= 5.4.0 BuildRequires: php-date @@ -58,8 +64,14 @@ BuildRequires: php-composer(fedora/autoloader) %endif # composer.json +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(phpoption/phpoption) >= %{phpoption_min_ver} with php-composer(phpoption/phpoption) < %{phpoption_max_ver}) +# remirepo:4 +%else Requires: php-composer(phpoption/phpoption) < %{phpoption_max_ver} Requires: php-composer(phpoption/phpoption) >= %{phpoption_min_ver} +%endif # phpcompatinfo (computed from version 0.5.0) Requires: php(language) >= 5.4.0 Requires: php-spl @@ -133,14 +145,10 @@ cp -rp src/PhpCollection %{buildroot}%{phpdir}/ %check %if %{with_tests} -: Skip test known to fail -sed 's/function testAdd/function SKIP_testAdd/' \ - -i tests/PhpCollection/Tests/SequenceTest.php - : Upstream tests RETURN_CODE=0 -PHPUNIT=$(which phpunit) -for PHP_EXEC in "" %{?rhel:php54 php55} php56 php70 php71 php72; do +PHPUNIT=$(which phpunit9) +for PHP_EXEC in "" php74 php80 php81; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose \ --bootstrap %{buildroot}%{phpdir}/PhpCollection/autoload.php \ @@ -154,6 +162,7 @@ exit $RETURN_CODE %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md @@ -162,6 +171,9 @@ exit $RETURN_CODE %changelog +* Mon Mar 21 2022 Remi Collet <remi@remirepo.net> - 0.6.0-1 +- update to 0.6.0 + * Thu Sep 07 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 0.5.0-4 - Bump release for rebuild |