diff --git a/.gitignore b/.gitignore index 78f7e10..d9ec8a9 100644 --- a/.gitignore +++ b/.gitignore @@ -8,14 +8,3 @@ /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 -/php-sabre-dav4-4.3.0-1f9bfa7.tgz -/php-sabre-dav4-4.3.1-130abb7.tgz -/php-sabre-dav4-4.4.0-b65362a.tgz -/php-sabre-dav4-4.5.0-7e40343.tgz -/php-sabre-dav4-4.5.1-b29899b.tgz -/php-sabre-dav4-4.6.0-5541453.tgz -/php-sabre-dav4-4.7.0-074373b.tgz diff --git a/php-sabre-dav4-autoload.patch b/php-sabre-dav4-autoload.patch index a9722e2..9cdafef 100644 --- a/php-sabre-dav4-autoload.patch +++ b/php-sabre-dav4-autoload.patch @@ -1,7 +1,7 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php --- ./tests/bootstrap.php.rpm 2019-07-05 14:29:48.486775637 +0200 +++ ./tests/bootstrap.php 2019-07-05 14:32:02.171555393 +0200 -@@ -2,15 +2,13 @@ +@@ -2,15 +2,11 @@ declare(strict_types=1); @@ -9,9 +9,7 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php - -$autoLoader = include __DIR__.'/../vendor/autoload.php'; +require '@BUILDROOT@/usr/share/php/Sabre/DAV4/autoload.php'; -+if (file_exists('/usr/share/php/Monolog2/autoload.php')) -+ require '/usr/share/php/Monolog2/autoload.php'; -+else require '/usr/share/php/Monolog/autoload.php'; ++require '/usr/share/php/Monolog/autoload.php'; // SabreDAV tests auto loading -$autoLoader->add('Sabre\\', __DIR__); @@ -22,7 +20,7 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php date_default_timezone_set('UTC'); -@@ -35,8 +33,8 @@ foreach ($environmentVars as $var) { +@@ -30,8 +26,8 @@ foreach ($environmentVars as $var) { $config = [ 'SABRE_TEMPDIR' => dirname(__FILE__).'/temp/', 'SABRE_HASSQLITE' => in_array('sqlite', PDO::getAvailableDrivers()), diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 333a5f9..d3868fc 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-2024 Remi Collet +# Copyright (c) 2013-2021 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 074373bcd689a30bcf5aaa6bbb20a3395964ce7a +%global gh_commit c1afdc77a95efea6ee40c03c45f57c3c0c80ec22 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project dav @@ -24,13 +24,13 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP -Version: 4.7.0 -Release: 3%{?dist} +Version: 4.1.5 +Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD # assets/openiconic is MIT -License: BSD-3-Clause AND MIT +License: BSD and MIT Source0: %{name}-%{version}-%{gh_short}.tgz # git snapshot to retrieve tests Source1: makesrc.sh @@ -46,8 +46,9 @@ 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) < 4) -BuildRequires: (php-composer(monolog/monolog) >= 1.27 with php-composer(monolog/monolog) < 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(monolog/monolog) >= 1.18 with php-composer(monolog/monolog) < 2) BuildRequires: php-dom BuildRequires: php-pcre BuildRequires: php-spl @@ -61,13 +62,19 @@ BuildRequires: php-curl BuildRequires: php-pdo BuildRequires: php-json # From composer.json, "require-dev" : { -# "friendsofphp/php-cs-fixer": "^2.19", -# "monolog/monolog": "^1.27 || ^2.0", -# "phpstan/phpstan": "^0.12 || ^1.0", -# "phpstan/phpstan-phpunit": "^1.0", -# "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6" -BuildRequires: phpunit9 >= 9.6 +# "friendsofphp/php-cs-fixer": "^2.17.1", +# "phpstan/phpstan": "^0.12", +# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", +# "evert/phpdoc-md" : "~0.1.0", +# "squizlabs/php_codesniffer": "~1.5.3" +# "monolog/monolog": "^1.18" +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 +BuildRequires: phpunit9 %global phpunit %{_bindir}/phpunit9 +%else +BuildRequires: phpunit8 +%global phpunit %{_bindir}/phpunit8 +%endif %endif # Autoloader BuildRequires: php-fedora-autoloader-devel @@ -89,7 +96,7 @@ BuildRequires: php-pdo_sqlite # "ext-date" : "*", # "ext-iconv" : "*", # "lib-libxml" : ">=2.7.0", -# "psr/log": "^1.0 || ^2.0 || ^3.0", +# "psr/log": "^1.0", # "ext-json": "*" Requires: php(language) >= 7.1 Requires: (php-composer(sabre/vobject) >= 4.2.1 with php-composer(sabre/vobject) < 5) @@ -97,7 +104,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) < 4) +Requires: (php-composer(psr/log) >= 1.0.1 with php-composer(psr/log) < 2) Requires: php-dom Requires: php-pcre Requires: php-spl @@ -112,9 +119,11 @@ 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) @@ -147,7 +156,7 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php %setup -q -n %{gh_project}-%{gh_commit} mv lib/DAV/Browser/assets/openiconic/ICON-LICENSE . -%patch -P0 -p1 -b .rpm +%patch0 -p1 -b .rpm : relocate for dir in CalDAV CardDAV DAV DAVACL; do @@ -165,11 +174,7 @@ 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/Log3/autoload.php', - '%{_datadir}/php/Psr/Log2/autoload.php', - '%{_datadir}/php/Psr/Log/autoload.php', - ], + '%{_datadir}/php/Psr/Log/autoload.php', ]); EOF @@ -195,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}" php81 php82 php83 php84; do +for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do if which $cmdarg; then set $cmdarg for ts in sabre-dav sabre-davacl sabre-caldav sabre-carddav; do @@ -222,90 +227,17 @@ exit $ret %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 4.7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 4.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Oct 29 2024 Remi Collet - 4.7.0-1 -- update to 4.7.0 - -* Fri Jul 19 2024 Fedora Release Engineering - 4.6.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jan 29 2024 Fedora Release Engineering - 4.6.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 4.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 4.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 11 2023 Remi Collet - 4.6.0-1 -- update to 4.6.0 - -* Thu Nov 23 2023 Remi Collet - 4.5.1-1 -- update to 4.5.1 - -* Tue Nov 14 2023 Remi Collet - 4.5.0-1 -- update to 4.5.0 - -* Fri Jul 21 2023 Fedora Release Engineering - 4.4.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 4.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 4.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 27 2022 Remi Collet - 4.4.0-1 -- update to 4.4.0 - -* Fri Jan 21 2022 Remi Collet - 4.3.1-1 -- update to 4.3.1 - -* Tue Dec 14 2021 Remi Collet - 4.3.0-1 -- update to 4.3.0 - -* 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 - -* Fri Jul 23 2021 Fedora Release Engineering - 4.1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - * Mon Feb 15 2021 Remi Collet - 4.1.5-1 - update to 4.1.5 -* Wed Jan 27 2021 Fedora Release Engineering - 4.1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - * Tue Jan 12 2021 Remi Collet - 4.1.4-1 - update to 4.1.4 - sources from git snapshot * Mon Nov 9 2020 Remi Collet - 4.1.3-1 - update to 4.1.3 - -* Mon Oct 5 2020 Remi Collet - 4.1.2-1 -- update to 4.1.2 - switch to phpunit9 -* Tue Jul 28 2020 Fedora Release Engineering - 4.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - * Tue Jul 14 2020 Remi Collet - 4.1.1-1 - update to 4.1.1 diff --git a/sources b/sources index 1492fa3..daf1e9b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.7.0-074373b.tgz) = 95f6a85567c7a6fcf0d74fe13a60465ea99a8c8d5920f82a6e8a98e96e21f05ea614f607d67360f7ff2f6c2393e1d447ebd5761697f371b29ffab92051ac4aac +SHA512 (php-sabre-dav4-4.1.5-c1afdc7.tgz) = 3f21634ae7494e78dcc93b4878ca640e46d4cdc005b47a5594892ba0c3e93917973166a470696e954034756abf2b1e6c5d559104d75a5331a7d98b3c72f2083d