summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json2
-rw-r--r--php-composer-ca-bundle.spec15
2 files changed, 11 insertions, 6 deletions
diff --git a/composer.json b/composer.json
index 5213e97..ed6a1b3 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
"symfony/phpunit-bridge": "^4.2 || ^5",
"phpstan/phpstan": "^0.12.55",
"psr/log": "^1.0",
- "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0"
+ "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
},
"autoload": {
"psr-4": {
diff --git a/php-composer-ca-bundle.spec b/php-composer-ca-bundle.spec
index e716293..fa77905 100644
--- a/php-composer-ca-bundle.spec
+++ b/php-composer-ca-bundle.spec
@@ -9,14 +9,14 @@
%bcond_without tests
-%global gh_commit 9fdb22c2e97a614657716178093cd1da90a64aa8
+%global gh_commit 0b072d51c5a9c6f3412f7ea3ab043d6603cb2582
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner composer
%global gh_project ca-bundle
%global php_home %{_datadir}/php
Name: php-composer-ca-bundle
-Version: 1.2.10
+Version: 1.2.11
Release: 1%{?dist}
Summary: Lets you find a path to the system CA
@@ -39,12 +39,12 @@ BuildRequires: php-cli
# "symfony/phpunit-bridge": "^4.2 || ^5",
# "phpstan/phpstan": "^0.12.55",
# "psr/log": "^1.0",
-# "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0"
+# "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: phpunit8
%global phpunit %{_bindir}/phpunit8
BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2)
-BuildRequires: (php-composer(symfony/process) >= 2.5 with php-composer(symfony/process) < 6)
+BuildRequires: (php-composer(symfony/process) >= 2.5 with php-composer(symfony/process) < 7)
%else
BuildRequires: phpunit
%global phpunit %{_bindir}/phpunit
@@ -114,6 +114,7 @@ cat << 'EOF' | tee vendor/autoload.php
require_once '%{buildroot}%{php_home}/Composer/CaBundle/autoload.php';
\Fedora\Autoloader\Dependencies::required(array(
array(
+ '%{php_home}/Symfony6/Component/Process/autoload.php',
'%{php_home}/Symfony5/Component/Process/autoload.php',
'%{php_home}/Symfony4/Component/Process/autoload.php',
'%{php_home}/Symfony3/Component/Process/autoload.php',
@@ -124,7 +125,7 @@ require_once '%{buildroot}%{php_home}/Composer/CaBundle/autoload.php';
EOF
ret=0
-for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80 php81; do
+for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -146,6 +147,10 @@ exit $ret
%changelog
+* Fri Oct 1 2021 Remi Collet <remi@remirepo.net> - 1.2.11-1
+- update to 1.2.11 (no change)
+- allow Symfony 6
+
* Tue Jun 8 2021 Remi Collet <remi@remirepo.net> - 1.2.10-1
- update to 1.2.10 (no change)