From 3cf9e41caf9219db3903fdcf53c4a26cc95e0ab6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Jan 2020 09:45:31 +0100 Subject: [PATCH 1/2] v1.2.6 (cherry picked from commit 64fdb9f5da2e878ec93b5ddb5d42a0594af12e1a) --- .gitignore | 3 +++ php-composer-ca-bundle.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 177416f..72fbd38 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ /php-composer-ca-bundle-1.1.3-8afa52c.tgz /php-composer-ca-bundle-1.1.4-558f321.tgz /php-composer-ca-bundle-1.2.3-f26a67e.tgz +/php-composer-ca-bundle-1.2.4-10bb965.tgz +/php-composer-ca-bundle-1.2.5-62e8fc2.tgz +/php-composer-ca-bundle-1.2.6-47fe531.tgz diff --git a/php-composer-ca-bundle.spec b/php-composer-ca-bundle.spec index 765703a..52ae43c 100644 --- a/php-composer-ca-bundle.spec +++ b/php-composer-ca-bundle.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit f26a67e397be0e5c00d7c52ec7b5010098e15ce5 +%global gh_commit 47fe531de31fca4a1b997f87308e7d7804348f7e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner composer %global gh_project ca-bundle @@ -14,7 +14,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-composer-ca-bundle -Version: 1.2.3 +Version: 1.2.6 Release: 1%{?dist} Summary: Lets you find a path to the system CA @@ -36,12 +36,12 @@ BuildRequires: php-cli # From composer.json, "require": { # "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8", # "psr/log": "^1.0", -# "symfony/process": "^2.5 || ^3.0 || ^4.0" +# "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: phpunit6 %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) < 5) +BuildRequires: (php-composer(symfony/process) >= 2.5 with php-composer(symfony/process) < 6) %else BuildRequires: phpunit %global phpunit %{_bindir}/phpunit @@ -111,6 +111,7 @@ cat << 'EOF' | tee vendor/autoload.php require_once '%{buildroot}%{php_home}/Composer/CaBundle/autoload.php'; \Fedora\Autoloader\Dependencies::required(array( array( + '%{php_home}/Symfony5/Component/Process/autoload.php', '%{php_home}/Symfony4/Component/Process/autoload.php', '%{php_home}/Symfony3/Component/Process/autoload.php', '%{php_home}/Symfony/Component/Process/autoload.php', @@ -142,6 +143,9 @@ exit $ret %changelog +* Tue Jan 14 2020 Remi Collet - 1.2.6-1 +- update to 1.2.6 + * Sat Aug 3 2019 Remi Collet - 1.2.3-1 - update to 1.2.3 diff --git a/sources b/sources index ea1c002..be50ef4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-composer-ca-bundle-1.2.3-f26a67e.tgz) = 39da8b9fa1605b64a14c553b6310147954f46b38985ab9ff908cd7171c2d6b633253083fefeb0d5fe50dcc7f13176c47004b21d2c44bf1ede6fa63b541248cb7 +SHA512 (php-composer-ca-bundle-1.2.6-47fe531.tgz) = 3e371796558a812ad38c26dea59ac881bd539495143d342f8a6a7139443d5d43d171b11cc364c0c2fd694617ad293056526421afc19d7277de91f7ff30a4d520 From 8cb2feca9a36fc093db728f64ab5dd0c172a4741 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 Apr 2020 10:52:56 +0200 Subject: [PATCH 2/2] v1.2.7 (cherry picked from commit 89778a7db15a055f255131e6dc1a066af17e28e5) --- .gitignore | 1 + php-composer-ca-bundle.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 72fbd38..6418f8b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /php-composer-ca-bundle-1.2.4-10bb965.tgz /php-composer-ca-bundle-1.2.5-62e8fc2.tgz /php-composer-ca-bundle-1.2.6-47fe531.tgz +/php-composer-ca-bundle-1.2.7-95c63ab.tgz diff --git a/php-composer-ca-bundle.spec b/php-composer-ca-bundle.spec index 52ae43c..0f415b7 100644 --- a/php-composer-ca-bundle.spec +++ b/php-composer-ca-bundle.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 47fe531de31fca4a1b997f87308e7d7804348f7e +%global gh_commit 95c63ab2117a72f48f5a55da9740a3273d45b7fd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner composer %global gh_project ca-bundle @@ -14,7 +14,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-composer-ca-bundle -Version: 1.2.6 +Version: 1.2.7 Release: 1%{?dist} Summary: Lets you find a path to the system CA @@ -143,6 +143,9 @@ exit $ret %changelog +* Wed Apr 8 2020 Remi Collet - 1.2.7-1 +- update to 1.2.7 + * Tue Jan 14 2020 Remi Collet - 1.2.6-1 - update to 1.2.6 diff --git a/sources b/sources index be50ef4..1524e67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-composer-ca-bundle-1.2.6-47fe531.tgz) = 3e371796558a812ad38c26dea59ac881bd539495143d342f8a6a7139443d5d43d171b11cc364c0c2fd694617ad293056526421afc19d7277de91f7ff30a4d520 +SHA512 (php-composer-ca-bundle-1.2.7-95c63ab.tgz) = 13d6de73d3a9370e8b5b478b1ab7dbfafc29ef2f2d1a0e705d74cdf6af3f979288805b0a98136db84c8131c993bf3baca91d875cb0d0c5a6181d548ee48ac3a9