diff --git a/.gitignore b/.gitignore index d9ec8a9..446cf85 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,7 @@ /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 +/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 b03d864..0611ec7 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 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.1.5 +Version: 4.2.3 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 @@ -200,7 +203,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 +230,19 @@ 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 + +* 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 + * Mon Feb 15 2021 Remi Collet - 4.1.5-1 - update to 4.1.5 diff --git a/sources b/sources index daf1e9b..20f5b6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.1.5-c1afdc7.tgz) = 3f21634ae7494e78dcc93b4878ca640e46d4cdc005b47a5594892ba0c3e93917973166a470696e954034756abf2b1e6c5d559104d75a5331a7d98b3c72f2083d +SHA512 (php-sabre-dav4-4.2.3-6703fb7.tgz) = 70f479495d637ba656def3d4619010ce12495f1adbe6d26cfa838478f6019a5a4d9529a2582b23a4f8742bee9989145b534df57a87a6274b178ac70935781257