Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Remi Collet
8264167e4f v1.3.1
(cherry picked from commit 1b544ef7cc)
2021-11-02 08:22:10 +01:00
Remi Collet
fb7a2472fe v1.3.0
(cherry picked from commit 248967d2b3)
2021-10-27 10:46:20 +02:00
3 changed files with 20 additions and 8 deletions

4
.gitignore vendored
View file

@ -1,3 +1,7 @@
clog
/php-composer-ca-bundle-1.2.8-8a7ecad.tgz
/php-composer-ca-bundle-1.2.9-78a0e28.tgz
/php-composer-ca-bundle-1.2.10-9fdb22c.tgz
/php-composer-ca-bundle-1.2.11-0b072d5.tgz
/php-composer-ca-bundle-1.3.0-6793336.tgz
/php-composer-ca-bundle-1.3.1-4c67918.tgz

View file

@ -1,6 +1,6 @@
# remirepo/fedora spec file for php-composer-ca-bundle
#
# Copyright (c) 2016-2019 Remi Collet
# Copyright (c) 2016-2021 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@ -9,15 +9,15 @@
%bcond_without tests
%global gh_commit 78a0e288fdcebf92aa2318a8d3656168da6ac1a5
%global gh_commit 4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b
%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.9
Release: 2%{?dist}
Version: 1.3.1
Release: 1%{?dist}
Summary: Lets you find a path to the system CA
License: MIT
@ -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; 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,13 @@ exit $ret
%changelog
* Sat Oct 30 2021 Remi Collet <remi@remirepo.net> - 1.3.1-1
- update to 1.3.1
* Wed Oct 27 2021 Remi Collet <remi@remirepo.net> - 1.3.0-1
- update to 1.3.0
- allow Symfony 6
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

View file

@ -1 +1 @@
SHA512 (php-composer-ca-bundle-1.2.9-78a0e28.tgz) = 5caa252b07d3f3c591907ffee65b15f06574dee40a7fb7e2516394bb77b8d9484c55d8dcc272ab45a84b0f4f97fe0f9f02cf95a809646184747161ef176eb8f0
SHA512 (php-composer-ca-bundle-1.3.1-4c67918.tgz) = d4e66c86d08b2f02d43e4b7a268852be5dd69de8c42558d63159dedc5b038825941db0f50ad804017ea631166cd8f6d6a963fdd1344a47396594ad6747587062