diff options
| -rw-r--r-- | php-composer-xdebug-handler3.spec | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/php-composer-xdebug-handler3.spec b/php-composer-xdebug-handler3.spec index 2c7bd7c..97e54f0 100644 --- a/php-composer-xdebug-handler3.spec +++ b/php-composer-xdebug-handler3.spec @@ -24,7 +24,7 @@ Name: php-%{gh_owner}-%{gh_project}%{major} Version: 3.0.3 -Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} +Release: 2%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: Restarts a process without Xdebug, version %{major} License: MIT @@ -45,10 +45,9 @@ BuildRequires: php-spl # "symfony/phpunit-bridge": "^6.0", # "phpstan/phpstan": "^1.0", # "phpstan/phpstan-strict-rules": "^1.1" -# only composer/pcre v1 is packaged %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 4) -BuildRequires: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 2) +BuildRequires: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 4) %else BuildRequires: php-PsrLog BuildRequires: php-composer-pcre @@ -66,7 +65,7 @@ BuildRequires: php-composer(fedora/autoloader) Requires: php(language) >= 7.2.5 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 4) -Requires: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 2) +Requires: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 4) %else Requires: php-PsrLog Requires: php-composer-pcre @@ -101,14 +100,17 @@ cat << 'EOF' | tee src/autoload.php require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\', __DIR__); -\Fedora\Autoloader\Dependencies::required(array( - array( +\Fedora\Autoloader\Dependencies::required([ + [ '%{_datadir}/php/Psr/Log3/autoload.php', '%{_datadir}/php/Psr/Log2/autoload.php', '%{_datadir}/php/Psr/Log/autoload.php', - ), - '%{_datadir}/php/Composer/Pcre/autoload.php', -)); + ], [ + '%{_datadir}/php/Composer/Pcre3/autoload.php', + '%{_datadir}/php/Composer/Pcre2/autoload.php', + '%{_datadir}/php/Composer/Pcre/autoload.php', + ], +]); EOF @@ -151,6 +153,9 @@ exit $ret %changelog +* Thu Mar 31 2022 Remi Collet <remi@remirepo.net> - 3.0.3-2 +- allow composer/pcre v2 and v3 + * Mon Feb 28 2022 Remi Collet <remi@remirepo.net> - 3.0.3-1 - update to 3.0.3 |