update to 4.7.0HEADmaster

1 files changed, 7 insertions, 31 deletions

diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec
index a6eb80e..c9e8d0a 100644
--- a/php-sabre-dav4.spec
+++ b/php-sabre-dav4.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-sabre-dav4
 #
-# Copyright (c) 2013-2022 Remi Collet
+# Copyright (c) 2013-2024 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,7 +10,7 @@
 %bcond_without       tests
 
 # Github
-%global gh_commit    554145304b4a026477d130928d16e626939b0b2a
+%global gh_commit    074373bcd689a30bcf5aaa6bbb20a3395964ce7a
 %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.6.0
+Version:        4.7.0
 Release:        1%{?dist}
 
 URL:            https://github.com/%{gh_owner}/%{gh_project}
@@ -41,8 +41,6 @@ Patch0:         %{name}-autoload.patch
 BuildArch:      noarch
 %if %{with tests}
 BuildRequires:  php(language) >= 7.1
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(sabre/vobject)   >= 4.2.1  with php-composer(sabre/vobject)  < 5)
 BuildRequires: (php-composer(sabre/event)     >= 5.0    with php-composer(sabre/event)    < 6)
 BuildRequires: (php-composer(sabre/xml)       >= 2.0.1  with php-composer(sabre/xml)      < 3)
@@ -50,16 +48,6 @@ BuildRequires: (php-composer(sabre/http)      >= 5.0.5  with php-composer(sabre/
 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)        < 4)
 BuildRequires: (php-composer(monolog/monolog) >= 1.27 with php-composer(monolog/monolog)  < 3)
-# remirepo:9
-%else
-BuildRequires:  php-sabre-vobject4  >= 4.2.1
-BuildRequires:  php-sabre-event5    >= 5.0.5
-BuildRequires:  php-sabre-xml2      >= 2.0.1
-BuildRequires:  php-sabre-http5     >= 5.0
-BuildRequires:  php-sabre-uri2      >= 2.0
-BuildRequires:  php-PsrLog          >= 1.0.1
-BuildRequires:  php-Monolog         >= 1.27
-%endif
 BuildRequires:  php-dom
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
@@ -104,23 +92,12 @@ BuildRequires:  php-pdo_sqlite
 #        "psr/log": "^1.0 || ^2.0 || ^3.0",
 #        "ext-json": "*"
 Requires:       php(language) >= 7.1
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:      (php-composer(sabre/vobject) >= 4.2.1  with php-composer(sabre/vobject) < 5)
 Requires:      (php-composer(sabre/event)   >= 5.0    with php-composer(sabre/event)   < 6)
 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)       < 4)
-# remirepo:8
-%else
-Requires:       php-sabre-vobject4 >= 4.2.1
-Requires:       php-sabre-event5   >= 5.0.5
-Requires:       php-sabre-xml2     >= 2.0.1
-Requires:       php-sabre-http5    >= 5.0
-Requires:       php-sabre-uri2     >= 2.0
-Requires:       php-PsrLog         >= 1.0.1
-%endif
 Requires:       php-dom
 Requires:       php-pcre
 Requires:       php-spl
@@ -135,11 +112,9 @@ Requires:       php-json
 #        "ext-curl" : "*",
 #        "ext-pdo" : "*",
 #        "ext-imap": "*"
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
 Recommends:     php-curl
 Recommends:     php-pdo
 Recommends:     php-imap
-%endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
 
@@ -220,7 +195,7 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php
 
 : Run upstream test suite against installed library
 ret=0
-for cmdarg in "php %{phpunit}" php80 php81 php82 php83; do
+for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do
   if which $cmdarg; then
     set $cmdarg
     for ts in sabre-dav sabre-davacl sabre-caldav sabre-carddav; do
@@ -236,8 +211,6 @@ exit $ret
 
 
 %files
-# remirepo:1
-%{!?_licensedir:%global license %%doc}
 %license *LICENSE
 %doc *md
 %doc composer.json
@@ -249,6 +222,9 @@ exit $ret
 
 
 %changelog
+* Tue Oct 29 2024 Remi Collet <remi@remirepo.net> - 4.7.0-1
+- update to 4.7.0
+
 * Mon Dec 11 2023 Remi Collet <remi@remirepo.net> - 4.6.0-1
 - update to 4.6.0