diff options
Diffstat (limited to 'php-symfony-polyfill.spec')
| -rw-r--r-- | php-symfony-polyfill.spec | 72 |
1 files changed, 20 insertions, 52 deletions
diff --git a/php-symfony-polyfill.spec b/php-symfony-polyfill.spec index dd741ca..d2e61d4 100644 --- a/php-symfony-polyfill.spec +++ b/php-symfony-polyfill.spec @@ -12,25 +12,14 @@ %global github_owner symfony %global github_name polyfill -%global github_version 1.19.0 -%global github_commit ac41071c7ef43e26e1231100fa9a316cebecdec7 +%global github_version 1.20.0 +%global github_commit 1601a7637ed1f2f6be3c9d906fa2b0d85a26744a %global composer_vendor symfony %global composer_project polyfill -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -# raise dependency on PHP 7 and ignore *_compat -%global php_min_ver 7.0 -%else -# "php": ">=5.3.3" -%global php_min_ver 5.3.3 -# "ircmaxell/password-compat": "~1.0" -%global ircmaxell_password_compat_min_ver 1.0 -%global ircmaxell_password_compat_max_ver 2.0 -# "paragonie/random_compat": "~1.0|~2.0|~9.99" -%global paragonie_random_compat_min_ver 1.0 -%global paragonie_random_compat_max_ver 3.0 -%endif +# "php": ">=7.1" +%global php_min_ver 7.1 # Build using "--without tests" to disable tests %bcond_without tests @@ -51,15 +40,14 @@ BuildArch: noarch BuildRequires: php-fedora-autoloader-devel # Tests %if %{with tests} -BuildRequires: php-composer(phpunit/phpunit) +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 +%global phpunit %{_bindir}/phpunit9 +%else +%global phpunit %{_bindir}/phpunit8 +%endif +BuildRequires: %{phpunit} ## composer.json BuildRequires: php(language) >= %{php_min_ver} -%if 0%{?fedora} < 27 && 0%{?rhel} < 8 -BuildRequires: php-composer(ircmaxell/password-compat) < %{ircmaxell_password_compat_max_ver} -BuildRequires: php-composer(ircmaxell/password-compat) >= %{ircmaxell_password_compat_min_ver} -BuildRequires: php-composer(paragonie/random_compat) < %{paragonie_random_compat_max_ver} -BuildRequires: php-composer(paragonie/random_compat) >= %{paragonie_random_compat_min_ver} -%endif ## phpcompatinfo (computed from version 1.8.0) BuildRequires: php-hash BuildRequires: php-iconv @@ -73,12 +61,6 @@ BuildRequires: php-spl # composer.json Requires: php(language) >= %{php_min_ver} -%if 0%{?fedora} < 27 && 0%{?rhel} < 8 -Requires: php-composer(ircmaxell/password-compat) < %{ircmaxell_password_compat_max_ver} -Requires: php-composer(ircmaxell/password-compat) >= %{ircmaxell_password_compat_min_ver} -Requires: php-composer(paragonie/random_compat) < %{paragonie_random_compat_max_ver} -Requires: php-composer(paragonie/random_compat) >= %{paragonie_random_compat_min_ver} -%endif # phpcompatinfo (computed from version 1.8.0) Requires: php-hash Requires: php-iconv @@ -94,11 +76,6 @@ Requires: php-composer(fedora/autoloader) Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} Provides: php-composer(%{composer_vendor}/%{composer_project}-mbstring) = %{version} Provides: php-composer(%{composer_vendor}/%{composer_project}-util) = %{version} -Provides: php-composer(%{composer_vendor}/%{composer_project}-php54) = %{version} -Provides: php-composer(%{composer_vendor}/%{composer_project}-php55) = %{version} -Provides: php-composer(%{composer_vendor}/%{composer_project}-php56) = %{version} -Provides: php-composer(%{composer_vendor}/%{composer_project}-php70) = %{version} -Provides: php-composer(%{composer_vendor}/%{composer_project}-php71) = %{version} Provides: php-composer(%{composer_vendor}/%{composer_project}-php72) = %{version} Provides: php-composer(%{composer_vendor}/%{composer_project}-php73) = %{version} Provides: php-composer(%{composer_vendor}/%{composer_project}-php74) = %{version} @@ -114,14 +91,9 @@ Autoloader: %{phpdir}/Symfony/Polyfill/autoload.php %setup -qn %{github_name}-%{github_commit} : Docs -mkdir -p docs/{Mbstring,Php54,Php55,Php56,Php70,Php71,Php72,Php73,Php74,Php80,Util} +mkdir -p docs/{Mbstring,Php72,Php73,Php74,Php80,Util} mv *.md composer.json docs/ mv src/Mbstring/{*.md,composer.json} docs/Mbstring/ -mv src/Php54/{*.md,composer.json} docs/Php54/ -mv src/Php55/{*.md,composer.json} docs/Php55/ -mv src/Php56/{*.md,composer.json} docs/Php56/ -mv src/Php70/{*.md,composer.json} docs/Php70/ -mv src/Php71/{*.md,composer.json} docs/Php71/ mv src/Php72/{*.md,composer.json} docs/Php72/ mv src/Php73/{*.md,composer.json} docs/Php73/ mv src/Php74/{*.md,composer.json} docs/Php74/ @@ -143,19 +115,10 @@ cat <<'AUTOLOAD' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required(array( __DIR__ . '/bootstrap.php', __DIR__ . '/Mbstring/bootstrap.php', - __DIR__ . '/Php54/bootstrap.php', - __DIR__ . '/Php55/bootstrap.php', - __DIR__ . '/Php56/bootstrap.php', - __DIR__ . '/Php70/bootstrap.php', - __DIR__ . '/Php71/bootstrap.php', __DIR__ . '/Php72/bootstrap.php', __DIR__ . '/Php73/bootstrap.php', __DIR__ . '/Php74/bootstrap.php', )); -\Fedora\Autoloader\Dependencies::optional(array( - '%{phpdir}/password_compat/password.php', - '%{phpdir}/random_compat/autoload.php', -)); AUTOLOAD @@ -170,11 +133,11 @@ cp -rp src/* %{buildroot}%{phpdir}/Symfony/Polyfill/ %if %{with tests} : Upstream tests RETURN_CODE=0 -PHPUNIT=$(which phpunit) # TODO php80 -for PHP_EXEC in "" %{?rhel:php54 php55 php56 php70 php71} php72 php73 php74; do - if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then - $PHP_EXEC $PHPUNIT --verbose \ +for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit9} --verbose \ --bootstrap %{buildroot}%{phpdir}/Symfony/Polyfill/autoload.php \ || RETURN_CODE=1 fi @@ -195,6 +158,11 @@ exit $RETURN_CODE %changelog +* Mon Oct 26 2020 Remi Collet <remi@remirepo.net> - 1.20.0-1 +- update to 1.20.0 +- raise dependency on PHP 7.1 +- switch to phpunit9 + * Fri Oct 23 2020 Remi Collet <remi@remirepo.net> - 1.19.0-1 - update to 1.19.0 |