diff options
Diffstat (limited to 'php-friendsofphp-proxy-manager-lts.spec')
| -rw-r--r-- | php-friendsofphp-proxy-manager-lts.spec | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/php-friendsofphp-proxy-manager-lts.spec b/php-friendsofphp-proxy-manager-lts.spec index 4aede43..6a77884 100644 --- a/php-friendsofphp-proxy-manager-lts.spec +++ b/php-friendsofphp-proxy-manager-lts.spec @@ -26,7 +26,7 @@ Name: php-%{composer_vendor}-%{composer_project}%{major} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: OOP proxy wrappers utilities License: MIT @@ -35,8 +35,8 @@ Source0: %{name}-%{github_version}-%{github_short}.tgz Source1: makesrc.sh BuildArch: noarch -# As we use phpunit9 -BuildRequires: php(language) >= 7.3 +# As we use laminas/code 4 +BuildRequires: php(language) >= 7.4 %if %{with tests} BuildRequires: php-reflection BuildRequires: php-pcre @@ -50,7 +50,7 @@ BuildRequires:(php-composer(symfony/filesystem) >= 4.4.17 with php-composer(s # "symfony/phpunit-bridge": "^5.4|^6.0" # remirepo:4 %else -BuildRequires: php-laminas-code >= 3.4.1 +BuildRequires: php-laminas-code4 BuildRequires: php-symfony4-filesystem >= 4.4.17 %endif %global phpunit %{_bindir}/phpunit9 @@ -71,7 +71,7 @@ Requires: (php-composer(laminas/laminas-code) >= 4.0 with php-composer(l Requires: (php-composer(symfony/filesystem) >= 4.4.17 with php-composer(symfony/filesystem) < 7) # remirepo:4 %else -Requires: php-laminas-code >= 3.4.1 +Requires: php-laminas-code4 Requires: php-symfony4-filesystem >= 4.4.17 %endif # phpcompatinfo (computed from version 1.0.3) @@ -116,18 +116,8 @@ phpab --template fedora \ cat <<'AUTOLOAD' | tee -a src/autoload.php -if (PHP_VERSION_ID < 70400) { - $code = '%{phpdir}/Laminas/Code/autoload.php'; -} else if (PHP_VERSION_ID < 80000) { - $code = [ - '%{phpdir}/Laminas/Code4/autoload.php', - '%{phpdir}/Laminas/Code/autoload.php', - ]; -} else { - $code = '%{phpdir}/Laminas/Code4/autoload.php'; -} \Fedora\Autoloader\Dependencies::required([ - $code, + '%{phpdir}/Laminas/Code4/autoload.php', [ '%{phpdir}/Symfony6/Component/Filesystem/autoload.php', '%{phpdir}/Symfony5/Component/Filesystem/autoload.php', @@ -157,7 +147,7 @@ EOF : Upstream tests ret=0 -for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do +for cmdarg in "php %{phpunit}" php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} \ @@ -182,6 +172,9 @@ exit $ret %changelog +* Wed Dec 7 2022 Remi Collet <remi@remirepo.net> - 1.0.13-2 +- always use laminas/code v4 + * Wed Oct 19 2022 Remi Collet <remi@remirepo.net> - 1.0.13-1 - update to 1.0.13 |