From 5784561ac9a151a01a6e07623dc5e9728164471f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 Nov 2021 11:30:27 +0100 Subject: [PATCH 1/4] v4.2.0 (cherry picked from commit 0a700dcaa87db4ecb3f78229c6a304e4b861a2aa) --- .gitignore | 1 + php-sabre-dav4.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d9ec8a9..3c38929 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /php-sabre-dav4-4.1.3-b903eee.tar.gz /php-sabre-dav4-4.1.4-4258420.tgz /php-sabre-dav4-4.1.5-c1afdc7.tgz +/php-sabre-dav4-4.2.0-af125a4.tgz diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index b03d864..4e29e29 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit c1afdc77a95efea6ee40c03c45f57c3c0c80ec22 +%global gh_commit af125a40abdac787c438a6fed6da3451bcaa0886 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project dav @@ -24,7 +24,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP -Version: 4.1.5 +Version: 4.2.0 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} @@ -200,7 +200,7 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do +for cmdarg in "php %{phpunit}" php74 php80 php81 ; do if which $cmdarg; then set $cmdarg for ts in sabre-dav sabre-davacl sabre-caldav sabre-carddav; do @@ -227,6 +227,9 @@ exit $ret %changelog +* Wed Nov 17 2021 Remi Collet - 4.2.0-1 +- update to 4.2.0 + * Mon Feb 15 2021 Remi Collet - 4.1.5-1 - update to 4.1.5 diff --git a/sources b/sources index daf1e9b..89f2133 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.1.5-c1afdc7.tgz) = 3f21634ae7494e78dcc93b4878ca640e46d4cdc005b47a5594892ba0c3e93917973166a470696e954034756abf2b1e6c5d559104d75a5331a7d98b3c72f2083d +SHA512 (php-sabre-dav4-4.2.0-af125a4.tgz) = de05fe4f63ed9ef1488bdbbabab887200e107112ac74d8f278255f2f6503b5813459a95e7b5fca3a0b00d194298caa5a68dd005c349b868131830fb42dee88f1 From a4fb3cc519c3cb63532802774a28fb301e2ec4ea Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 30 Nov 2021 16:12:17 +0100 Subject: [PATCH 2/4] v4.2.1 (cherry picked from commit 02435a9c50d54c8f0b61edafa18325155ed31c60) --- .gitignore | 1 + php-sabre-dav4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3c38929..a626575 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /php-sabre-dav4-4.1.4-4258420.tgz /php-sabre-dav4-4.1.5-c1afdc7.tgz /php-sabre-dav4-4.2.0-af125a4.tgz +/php-sabre-dav4-4.2.1-5e651f9.tgz diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 4e29e29..e43f233 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit af125a40abdac787c438a6fed6da3451bcaa0886 +%global gh_commit 5e651f9ddc2b05745f5b28cd697c8e8c6a0b6146 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project dav @@ -24,7 +24,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP -Version: 4.2.0 +Version: 4.2.1 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} @@ -227,6 +227,9 @@ exit $ret %changelog +* Tue Nov 30 2021 Remi Collet - 4.2.1-1 +- update to 4.2.1 + * Wed Nov 17 2021 Remi Collet - 4.2.0-1 - update to 4.2.0 diff --git a/sources b/sources index 89f2133..7fe25a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.2.0-af125a4.tgz) = de05fe4f63ed9ef1488bdbbabab887200e107112ac74d8f278255f2f6503b5813459a95e7b5fca3a0b00d194298caa5a68dd005c349b868131830fb42dee88f1 +SHA512 (php-sabre-dav4-4.2.1-5e651f9.tgz) = 83f11d184bcf329c4002660cd428cfaa8c601f1ad1c34bb1001c19d02dc8cb8f689b154effbc2ab9ac051147633ba8a8fa85b7bafb967c103e2b4b777ef249be From 04f019813e0ee4496d873f5c2bbfaab50ba45695 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Dec 2021 10:38:35 +0100 Subject: [PATCH 3/4] update to 4.2.2 allow psr/log v2 and v3 (cherry picked from commit 3c62afe770e37affd0cd7143b2cddb9cbf0d13c8) --- .gitignore | 1 + php-sabre-dav4.spec | 21 ++++++++++++++------- sources | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index a626575..c01cfe4 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /php-sabre-dav4-4.1.5-c1afdc7.tgz /php-sabre-dav4-4.2.0-af125a4.tgz /php-sabre-dav4-4.2.1-5e651f9.tgz +/php-sabre-dav4-4.2.2-5d73987.tgz diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index e43f233..8eb79ea 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 5e651f9ddc2b05745f5b28cd697c8e8c6a0b6146 +%global gh_commit 5d739875d624e064018b4709ab544063df42d749 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project dav @@ -24,7 +24,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP -Version: 4.2.1 +Version: 4.2.2 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} @@ -46,8 +46,7 @@ BuildRequires: (php-composer(sabre/event) >= 5.0 with php-composer(sabre/ BuildRequires: (php-composer(sabre/xml) >= 2.0.1 with php-composer(sabre/xml) < 3) BuildRequires: (php-composer(sabre/http) >= 5.0.5 with php-composer(sabre/http) < 6) BuildRequires: (php-composer(sabre/uri) >= 2.0 with php-composer(sabre/uri) < 3) -BuildRequires: (php-composer(psr/log) >= 1.0.1 with php-composer(psr/log) < 2) -BuildRequires: (php-composer(psr/log) >= 1.0.1 with php-composer(psr/log) < 2) +BuildRequires: (php-composer(psr/log) >= 1.0.1 with php-composer(psr/log) < 4) BuildRequires: (php-composer(monolog/monolog) >= 1.18 with php-composer(monolog/monolog) < 2) BuildRequires: php-dom BuildRequires: php-pcre @@ -96,7 +95,7 @@ BuildRequires: php-pdo_sqlite # "ext-date" : "*", # "ext-iconv" : "*", # "lib-libxml" : ">=2.7.0", -# "psr/log": "^1.0", +# "psr/log": "^1.0 || ^2.0 || ^3.0", # "ext-json": "*" Requires: php(language) >= 7.1 Requires: (php-composer(sabre/vobject) >= 4.2.1 with php-composer(sabre/vobject) < 5) @@ -104,7 +103,7 @@ Requires: (php-composer(sabre/event) >= 5.0 with php-composer(sabre/ev Requires: (php-composer(sabre/xml) >= 2.0.1 with php-composer(sabre/xml) < 3) Requires: (php-composer(sabre/http) >= 5.0.5 with php-composer(sabre/http) < 6) Requires: (php-composer(sabre/uri) >= 2.0 with php-composer(sabre/uri) < 3) -Requires: (php-composer(psr/log) >= 1.0.1 with php-composer(psr/log) < 2) +Requires: (php-composer(psr/log) >= 1.0.1 with php-composer(psr/log) < 4) Requires: php-dom Requires: php-pcre Requires: php-spl @@ -174,7 +173,11 @@ cat << 'EOF' | tee -a lib/%{ns_project}%{major}/autoload.php '%{_datadir}/php/%{ns_vendor}/Uri2/autoload.php', '%{_datadir}/php/%{ns_vendor}/HTTP5/autoload.php', '%{_datadir}/php/%{ns_vendor}/VObject4/autoload.php', - '%{_datadir}/php/Psr/Log/autoload.php', + [ + '%{_datadir}/php/Psr/Log3/autoload.php', + '%{_datadir}/php/Psr/Log2/autoload.php', + '%{_datadir}/php/Psr/Log/autoload.php', + ], ]); EOF @@ -227,6 +230,10 @@ exit $ret %changelog +* Thu Dec 9 2021 Remi Collet - 4.2.2-1 +- update to 4.2.2 +- allow psr/log v2 and v3 + * Tue Nov 30 2021 Remi Collet - 4.2.1-1 - update to 4.2.1 diff --git a/sources b/sources index 7fe25a7..89c5fd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.2.1-5e651f9.tgz) = 83f11d184bcf329c4002660cd428cfaa8c601f1ad1c34bb1001c19d02dc8cb8f689b154effbc2ab9ac051147633ba8a8fa85b7bafb967c103e2b4b777ef249be +SHA512 (php-sabre-dav4-4.2.2-5d73987.tgz) = c73bfab15fc57d561e9edd111c56ae141b3c230beb02d86e805c11bb4ffb22167deee2214349fd24425df78ee40a29455fb6a76d97c288f42be00518a6d5cea4 From 9aa0c87358c28374d4c0933668c2d3d31b7b671f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Dec 2021 14:06:53 +0100 Subject: [PATCH 4/4] v4.2.3 (cherry picked from commit fbb8728fccb9a0698ad19db6d9c1aa30eb51e159) --- .gitignore | 1 + php-sabre-dav4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c01cfe4..446cf85 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /php-sabre-dav4-4.2.0-af125a4.tgz /php-sabre-dav4-4.2.1-5e651f9.tgz /php-sabre-dav4-4.2.2-5d73987.tgz +/php-sabre-dav4-4.2.3-6703fb7.tgz diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 8eb79ea..0611ec7 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 5d739875d624e064018b4709ab544063df42d749 +%global gh_commit 6703fb74952cd4e2d8135a71b4f78ce2eecc37bc %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project dav @@ -24,7 +24,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP -Version: 4.2.2 +Version: 4.2.3 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} @@ -230,6 +230,9 @@ exit $ret %changelog +* Thu Dec 9 2021 Remi Collet - 4.2.3-1 +- update to 4.2.3 + * Thu Dec 9 2021 Remi Collet - 4.2.2-1 - update to 4.2.2 - allow psr/log v2 and v3 diff --git a/sources b/sources index 89c5fd3..20f5b6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.2.2-5d73987.tgz) = c73bfab15fc57d561e9edd111c56ae141b3c230beb02d86e805c11bb4ffb22167deee2214349fd24425df78ee40a29455fb6a76d97c288f42be00518a6d5cea4 +SHA512 (php-sabre-dav4-4.2.3-6703fb7.tgz) = 70f479495d637ba656def3d4619010ce12495f1adbe6d26cfa838478f6019a5a4d9529a2582b23a4f8742bee9989145b534df57a87a6274b178ac70935781257