From 530ef7221f9caf85792105decbeaf348ef76b9f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 22:09:15 +0000 Subject: [PATCH 01/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-dav4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 25fae75..fa0e6ff 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -23,7 +23,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP Version: 4.1.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -217,6 +217,9 @@ exit $ret %changelog +* 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 From 6b1f77b6d11a7de7aef0e1eaa80bdddc207b706c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Oct 2020 10:36:14 +0200 Subject: [PATCH 02/27] update to 4.1.2 switch to phpunit9 --- .gitignore | 1 + php-sabre-dav4.spec | 31 ++++++++++++++++++++++--------- sources | 2 +- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 61203de..6287afd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /php-sabre-dav4-4.0.3-b793fb4.tar.gz /php-sabre-dav4-4.1.0-8f6f4d2.tar.gz /php-sabre-dav4-4.1.1-5736f94.tar.gz +/php-sabre-dav4-4.1.2-e1f617a.tar.gz diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index fa0e6ff..745b163 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -6,8 +6,11 @@ # # Please, preserve the changelog entries # + +%bcond_without tests + # Github -%global gh_commit 5736f943c90d8d73d04cd8944d8c913811dc7360 +%global gh_commit e1f617a4112da461bfc31aa4e87e0e6ac0bd6ed0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project dav @@ -18,12 +21,11 @@ %global ns_vendor Sabre %global ns_project DAV %global major 4 -%bcond_without tests Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP -Version: 4.1.1 -Release: 2%{?dist} +Version: 4.1.2 +Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -64,14 +66,20 @@ BuildRequires: php-json # "evert/phpdoc-md" : "~0.1.0", # "squizlabs/php_codesniffer": "~1.5.3" # "monolog/monolog": "^1.18" -BuildRequires: phpunit8 >= 8.5 +%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 BuildRequires: php-pdo_sqlite # From composer.json, "require": { -# "php": ">=7.1.0", +# "php": ">=7.1.0 || ^8.0", # "sabre/vobject": "^4.2.1", # "sabre/event" : "^5.0", # "sabre/xml" : "^2.0.1", @@ -192,9 +200,10 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php : Run upstream test suite against installed library ret=0 -for cmd in php php72 php73 php74 php80; do - if which $cmd; then - $cmd %{_bindir}/phpunit8 \ +for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit9} \ --filter '^((?!(testDeliverInsignificantRequest)).)*$' \ || ret=1 fi @@ -217,6 +226,10 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 728fa85..829fbb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.1.1-5736f94.tar.gz) = d650e5319184a1148134ba75669c4effd9c7e59718695ec08db6e2cd1f427cf41f709320caf0afa2626f7a3c2ee13b2dd02e67037615e5ee2f1aef2afc75064b +SHA512 (php-sabre-dav4-4.1.2-e1f617a.tar.gz) = 0fed8ba58043bd6dffc4a36f146b4c9c86eb7dec00db2f89f1318594a834d697effb4590b170de9d450c69feeae9954de59d789a695171a53505538c2a097c66 From 4436c7ad79dd0a6b9a535d21b8179894f3edf8f8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 9 Nov 2020 16:08:38 +0100 Subject: [PATCH 03/27] v4.1.3 --- .gitignore | 1 + php-sabre-dav4.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6287afd..27c2127 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /php-sabre-dav4-4.1.0-8f6f4d2.tar.gz /php-sabre-dav4-4.1.1-5736f94.tar.gz /php-sabre-dav4-4.1.2-e1f617a.tar.gz +/php-sabre-dav4-4.1.3-b903eee.tar.gz diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 745b163..419ab19 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit e1f617a4112da461bfc31aa4e87e0e6ac0bd6ed0 +%global gh_commit b903eeedfbdcd6cab7935661ec6dc2d90cdf8a1e %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.2 +Version: 4.1.3 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} @@ -60,7 +60,7 @@ BuildRequires: php-curl BuildRequires: php-pdo BuildRequires: php-json # From composer.json, "require-dev" : { -# "friendsofphp/php-cs-fixer": "~2.16.1", +# "friendsofphp/php-cs-fixer": "~2.16.7", # "phpstan/phpstan": "^0.12", # "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", # "evert/phpdoc-md" : "~0.1.0", @@ -226,6 +226,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 829fbb4..0fc254b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.1.2-e1f617a.tar.gz) = 0fed8ba58043bd6dffc4a36f146b4c9c86eb7dec00db2f89f1318594a834d697effb4590b170de9d450c69feeae9954de59d789a695171a53505538c2a097c66 +SHA512 (php-sabre-dav4-4.1.3-b903eee.tar.gz) = 46c1151461be0e6cba93ab71e372b272869196eb3dc287315c210756f54f6e856df1e6eaf541bca7c92f712b7ca64ce7446f1fad88f5f08d11c9d9648a53f5c7 From 8277a0ea8621c0a33be3452381a86be65034dbc7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Jan 2021 08:34:55 +0100 Subject: [PATCH 04/27] update to 4.1.4 sources from git snapshot --- .gitignore | 1 + makesrc.sh | 32 ++++++++++++++++++++++++++++++++ php-sabre-dav4.spec | 25 +++++++++++++++---------- sources | 2 +- 4 files changed, 49 insertions(+), 11 deletions(-) create mode 100755 makesrc.sh diff --git a/.gitignore b/.gitignore index 27c2127..c077675 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /php-sabre-dav4-4.1.1-5736f94.tar.gz /php-sabre-dav4-4.1.2-e1f617a.tar.gz /php-sabre-dav4-4.1.3-b903eee.tar.gz +/php-sabre-dav4-4.1.4-4258420.tgz diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..f9982c6 --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +NAME=$(basename $PWD) +OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) +PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) +VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) +COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) +SHORT=${COMMIT:0:7} + +if [ -f $NAME-$VERSION-$SHORT.tgz ]; then + echo "Already there." +else + echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" + + echo "Cloning..." + rm -rf $PROJECT-$COMMIT + git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + + echo "Getting commit..." + pushd $PROJECT-$COMMIT + git checkout $COMMIT || exit 1 + cp composer.json ../composer.json + popd + + echo "Archiving..." + tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs $PROJECT-$COMMIT + + echo "Cleaning..." + rm -rf $PROJECT-$COMMIT + + echo "Done." +fi diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 419ab19..1424e57 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-2020 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 b903eeedfbdcd6cab7935661ec6dc2d90cdf8a1e +%global gh_commit 4258420f15425a5f128fe5cad454e00ab4a68ae5 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project dav @@ -24,14 +24,16 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP -Version: 4.1.3 +Version: 4.1.4 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD # assets/openiconic is MIT License: BSD and MIT -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz +Source0: %{name}-%{version}-%{gh_short}.tgz +# git snapshot to retrieve tests +Source1: makesrc.sh # replace composer autoloader Patch0: %{name}-autoload.patch @@ -60,7 +62,7 @@ BuildRequires: php-curl BuildRequires: php-pdo BuildRequires: php-json # From composer.json, "require-dev" : { -# "friendsofphp/php-cs-fixer": "~2.16.7", +# "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", @@ -196,16 +198,15 @@ cp -pr lib %{buildroot}%{_datadir}/php/%{ns_vendor} cd tests sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php -# TODO testDeliverInsignificantRequest fails locally, not in mock - : Run upstream test suite against installed library ret=0 for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit9} \ - --filter '^((?!(testDeliverInsignificantRequest)).)*$' \ - || ret=1 + for ts in sabre-dav sabre-davacl sabre-caldav sabre-carddav; do + $1 ${2:-%{_bindir}/phpunit9} \ + --testsuite $ts || ret=1 + done fi done exit $ret @@ -226,6 +227,10 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 0fc254b..46dd795 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.1.3-b903eee.tar.gz) = 46c1151461be0e6cba93ab71e372b272869196eb3dc287315c210756f54f6e856df1e6eaf541bca7c92f712b7ca64ce7446f1fad88f5f08d11c9d9648a53f5c7 +SHA512 (php-sabre-dav4-4.1.4-4258420.tgz) = 35d7eeb18de18bce1d8ecbc0aacf907ae4f6c84108108f86fa632e0ad13c642e87bb73432234df58ff03cab59b92977f40a6f18c0a829890a351d30a0034fd4a From 95a289f91010929ff1bc3b611dc7e84c260835a0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 07:46:14 +0000 Subject: [PATCH 05/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-dav4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 1424e57..3f5eb46 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP Version: 4.1.4 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -227,6 +227,9 @@ exit $ret %changelog +* 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 From 2e0922da0afd5d7b973117cd03e6138bff90eb63 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 15 Feb 2021 13:49:19 +0100 Subject: [PATCH 06/27] v4.1.5 --- .gitignore | 1 + php-sabre-dav4.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c077675..d9ec8a9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /php-sabre-dav4-4.1.2-e1f617a.tar.gz /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 diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 3f5eb46..b03d864 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 4258420f15425a5f128fe5cad454e00ab4a68ae5 +%global gh_commit c1afdc77a95efea6ee40c03c45f57c3c0c80ec22 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project dav @@ -24,8 +24,8 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP -Version: 4.1.4 -Release: 2%{?dist} +Version: 4.1.5 +Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -227,6 +227,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 46dd795..daf1e9b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.1.4-4258420.tgz) = 35d7eeb18de18bce1d8ecbc0aacf907ae4f6c84108108f86fa632e0ad13c642e87bb73432234df58ff03cab59b92977f40a6f18c0a829890a351d30a0034fd4a +SHA512 (php-sabre-dav4-4.1.5-c1afdc7.tgz) = 3f21634ae7494e78dcc93b4878ca640e46d4cdc005b47a5594892ba0c3e93917973166a470696e954034756abf2b1e6c5d559104d75a5331a7d98b3c72f2083d From d8db2ba5055f2a42937a60f9b40259ffd6efb8d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 03:11:53 +0000 Subject: [PATCH 07/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-dav4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index b03d864..cb5711c 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP Version: 4.1.5 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -227,6 +227,9 @@ exit $ret %changelog +* 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 From 0a700dcaa87db4ecb3f78229c6a304e4b861a2aa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 Nov 2021 11:30:27 +0100 Subject: [PATCH 08/27] v4.2.0 --- .gitignore | 1 + php-sabre-dav4.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 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 cb5711c..0febd3a 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,8 +24,8 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP -Version: 4.1.5 -Release: 2%{?dist} +Version: 4.2.0 +Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -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 + * Fri Jul 23 2021 Fedora Release Engineering - 4.1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild 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 02435a9c50d54c8f0b61edafa18325155ed31c60 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 30 Nov 2021 16:12:17 +0100 Subject: [PATCH 09/27] v4.2.1 --- .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 0febd3a..b0ae170 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 3c62afe770e37affd0cd7143b2cddb9cbf0d13c8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Dec 2021 10:38:35 +0100 Subject: [PATCH 10/27] update to 4.2.2 allow psr/log v2 and v3 --- .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 b0ae170..544d0cf 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 fbb8728fccb9a0698ad19db6d9c1aa30eb51e159 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Dec 2021 14:06:53 +0100 Subject: [PATCH 11/27] v4.2.3 --- .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 544d0cf..e08f121 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 From 659340b82333c41ae1e5cca5e34776607ab5c7ea Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Dec 2021 11:12:38 +0100 Subject: [PATCH 12/27] v4.3.0 --- .gitignore | 1 + php-sabre-dav4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 446cf85..69d0631 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /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 diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index e08f121..9ec6d89 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 6703fb74952cd4e2d8135a71b4f78ce2eecc37bc +%global gh_commit 1f9bfa733a22e3c1f7526d645dab2cee96eba51a %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.3 +Version: 4.3.0 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} @@ -230,6 +230,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 20f5b6e..ee7ed23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.2.3-6703fb7.tgz) = 70f479495d637ba656def3d4619010ce12495f1adbe6d26cfa838478f6019a5a4d9529a2582b23a4f8742bee9989145b534df57a87a6274b178ac70935781257 +SHA512 (php-sabre-dav4-4.3.0-1f9bfa7.tgz) = de9148747135b987f7082d6809123b047bee4d57c0a08a8c4062abc7a89a0604c33a61c0d55a7fcfb9d3e4fa55acc55fff15f9a8d41770bc7c47f8784d8f8d07 From 36c9959e1080cfb3c847443be777dfaea7ed5af3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Jan 2022 08:39:49 +0100 Subject: [PATCH 13/27] v4.3.1 --- .gitignore | 1 + php-sabre-dav4.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 69d0631..7bc7621 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /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 diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 9ec6d89..363603c 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-2021 Remi Collet +# Copyright (c) 2013-2022 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 1f9bfa733a22e3c1f7526d645dab2cee96eba51a +%global gh_commit 130abb7017f56e0d99b04eb94b041e000a8e9b39 %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.3.0 +Version: 4.3.1 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} @@ -230,6 +230,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index ee7ed23..48bc32e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.3.0-1f9bfa7.tgz) = de9148747135b987f7082d6809123b047bee4d57c0a08a8c4062abc7a89a0604c33a61c0d55a7fcfb9d3e4fa55acc55fff15f9a8d41770bc7c47f8784d8f8d07 +SHA512 (php-sabre-dav4-4.3.1-130abb7.tgz) = 0914cab6f5c482814d80d7d5baad6bff6a31b71320508bb47fbff224382e26d7f5da05c430a9a5429886c7202315bd56ec624a0536c181dfc55410ed9fe47d25 From 86a0245dd7111cb3eb4ff3a71e82d2c54cb5ea9f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 27 Jun 2022 12:55:24 +0200 Subject: [PATCH 14/27] v4.4.0 --- .gitignore | 1 + php-sabre-dav4.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7bc7621..5dc8940 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /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 diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 363603c..40a32d5 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 130abb7017f56e0d99b04eb94b041e000a8e9b39 +%global gh_commit b65362abc926520eda2c57e219f022a6c288069d %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.3.1 +Version: 4.4.0 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} @@ -203,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}" php74 php80 php81 ; do +for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do if which $cmdarg; then set $cmdarg for ts in sabre-dav sabre-davacl sabre-caldav sabre-carddav; do @@ -230,6 +230,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 48bc32e..dc2619b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.3.1-130abb7.tgz) = 0914cab6f5c482814d80d7d5baad6bff6a31b71320508bb47fbff224382e26d7f5da05c430a9a5429886c7202315bd56ec624a0536c181dfc55410ed9fe47d25 +SHA512 (php-sabre-dav4-4.4.0-b65362a.tgz) = 431ffaa5294d7f1ab4fac49cbc58a86afe5b84ac2dc67a373f714183c8cc294191169678aed68158676716a2fb4d1cf64f244141196d8cd180ccab5c9f02a562 From e8d2ae36beb4a86c5355109ab619ef47fac225cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 14:25:00 +0000 Subject: [PATCH 15/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-dav4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 40a32d5..3856c48 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP Version: 4.4.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -230,6 +230,9 @@ exit $ret %changelog +* 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 From bd36a92f253197f4f3b52f565ce3d548fac5c906 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 09:19:39 +0000 Subject: [PATCH 16/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-dav4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 3856c48..b9f775a 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP Version: 4.4.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -230,6 +230,9 @@ exit $ret %changelog +* 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 From 2fdb3da3b5835f58ace012ba54a4417b9dcd497a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 05:07:50 +0000 Subject: [PATCH 17/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-dav4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index b9f775a..25f6d9c 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP Version: 4.4.0 -Release: 3%{?dist} +Release: 4%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -230,6 +230,9 @@ exit $ret %changelog +* 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 From 07d78049fb7263cb098c4e7cb9a836e62b5c2645 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Nov 2023 13:47:52 +0100 Subject: [PATCH 18/27] v4.5.0 --- .gitignore | 1 + php-sabre-dav4.spec | 35 ++++++++++++++++------------------- sources | 2 +- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 5dc8940..553179d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /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 diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 25f6d9c..7744c4c 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit b65362abc926520eda2c57e219f022a6c288069d +%global gh_commit 7e40343e473f17eab3d1d6ca4ae3e1cdfc6e0fd8 %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.4.0 -Release: 4%{?dist} +Version: 4.5.0 +Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD # assets/openiconic is MIT -License: BSD and MIT +License: BSD-3-Clause AND MIT Source0: %{name}-%{version}-%{gh_short}.tgz # git snapshot to retrieve tests Source1: makesrc.sh @@ -47,7 +47,7 @@ BuildRequires: (php-composer(sabre/xml) >= 2.0.1 with php-composer(sabre/ 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.18 with php-composer(monolog/monolog) < 2) +BuildRequires: (php-composer(monolog/monolog) >= 1.27 with php-composer(monolog/monolog) < 2) BuildRequires: php-dom BuildRequires: php-pcre BuildRequires: php-spl @@ -61,19 +61,13 @@ BuildRequires: php-curl BuildRequires: php-pdo BuildRequires: php-json # From composer.json, "require-dev" : { -# "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 +# "friendsofphp/php-cs-fixer": "^2.19", +# "monolog/monolog": "^1.27", +# "phpstan/phpstan": "^0.12 || ^1.0", +# "phpstan/phpstan-phpunit": "^1.0", +# "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6" +BuildRequires: phpunit9 >= 9.6 %global phpunit %{_bindir}/phpunit9 -%else -BuildRequires: phpunit8 -%global phpunit %{_bindir}/phpunit8 -%endif %endif # Autoloader BuildRequires: php-fedora-autoloader-devel @@ -155,7 +149,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 . -%patch0 -p1 -b .rpm +%patch -P0 -p1 -b .rpm : relocate for dir in CalDAV CardDAV DAV DAVACL; do @@ -203,7 +197,7 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do +for cmdarg in "php %{phpunit}" php80 php81 php82 php83; do if which $cmdarg; then set $cmdarg for ts in sabre-dav sabre-davacl sabre-caldav sabre-carddav; do @@ -230,6 +224,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index dc2619b..35c799f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.4.0-b65362a.tgz) = 431ffaa5294d7f1ab4fac49cbc58a86afe5b84ac2dc67a373f714183c8cc294191169678aed68158676716a2fb4d1cf64f244141196d8cd180ccab5c9f02a562 +SHA512 (php-sabre-dav4-4.5.0-7e40343.tgz) = 913b7bfda8166b737dc0b387fce9e848c2a23be22e62f8fedb672d14aa88d5868aa841a001902eb58002996a63ec65ff4e766072b5e73be23930c69202716fd6 From 8c4d886dbf138cd011cb3f9ad1241b520fea3b70 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Nov 2023 08:47:34 +0100 Subject: [PATCH 19/27] v4.5.1 --- .gitignore | 1 + php-sabre-dav4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 553179d..8215210 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /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 diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 7744c4c..e68519f 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 7e40343e473f17eab3d1d6ca4ae3e1cdfc6e0fd8 +%global gh_commit b29899b675371aee73920165d1dc5a2235aa104b %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.5.0 +Version: 4.5.1 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} @@ -224,6 +224,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 35c799f..43c437b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.5.0-7e40343.tgz) = 913b7bfda8166b737dc0b387fce9e848c2a23be22e62f8fedb672d14aa88d5868aa841a001902eb58002996a63ec65ff4e766072b5e73be23930c69202716fd6 +SHA512 (php-sabre-dav4-4.5.1-b29899b.tgz) = b9be1a46757078a2e7128ad59a55edce381224dbd558ce597dac3e3a622f7ae4be00a4a84d9965ddacc4a4e0d8728a478f6381dfe84a2d830e9a359414f7f5de From 5dad4469bf61a375679cb7a2c73a0a26ac97fbdf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 11 Dec 2023 15:01:11 +0100 Subject: [PATCH 20/27] v4.6.0 --- .gitignore | 1 + php-sabre-dav4-autoload.patch | 8 +++++--- php-sabre-dav4.spec | 11 +++++++---- sources | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 8215210..2ba7911 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /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 diff --git a/php-sabre-dav4-autoload.patch b/php-sabre-dav4-autoload.patch index 9cdafef..a9722e2 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,11 @@ +@@ -2,15 +2,13 @@ declare(strict_types=1); @@ -9,7 +9,9 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php - -$autoLoader = include __DIR__.'/../vendor/autoload.php'; +require '@BUILDROOT@/usr/share/php/Sabre/DAV4/autoload.php'; -+require '/usr/share/php/Monolog/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'; // SabreDAV tests auto loading -$autoLoader->add('Sabre\\', __DIR__); @@ -20,7 +22,7 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php date_default_timezone_set('UTC'); -@@ -30,8 +26,8 @@ foreach ($environmentVars as $var) { +@@ -35,8 +33,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 e68519f..0eaadad 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit b29899b675371aee73920165d1dc5a2235aa104b +%global gh_commit 554145304b4a026477d130928d16e626939b0b2a %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.5.1 +Version: 4.6.0 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} @@ -47,7 +47,7 @@ BuildRequires: (php-composer(sabre/xml) >= 2.0.1 with php-composer(sabre/ 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) < 2) +BuildRequires: (php-composer(monolog/monolog) >= 1.27 with php-composer(monolog/monolog) < 3) BuildRequires: php-dom BuildRequires: php-pcre BuildRequires: php-spl @@ -62,7 +62,7 @@ BuildRequires: php-pdo BuildRequires: php-json # From composer.json, "require-dev" : { # "friendsofphp/php-cs-fixer": "^2.19", -# "monolog/monolog": "^1.27", +# "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" @@ -224,6 +224,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 43c437b..a55f18e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.5.1-b29899b.tgz) = b9be1a46757078a2e7128ad59a55edce381224dbd558ce597dac3e3a622f7ae4be00a4a84d9965ddacc4a4e0d8728a478f6381dfe84a2d830e9a359414f7f5de +SHA512 (php-sabre-dav4-4.6.0-5541453.tgz) = ea14ac1f1b203c66d7655bc6ebbb28290dd40227b4e2a19937530510c89af1ca661c678808b63c4edbc7eb5462727ac7d39db4dde5552f7b1ab4249de203ac1c From 1431248a46cf7d8f52d9b36bda9d73cbab4fe483 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:23:03 +0000 Subject: [PATCH 21/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-sabre-dav4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 0eaadad..37f0791 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP Version: 4.6.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -224,6 +224,9 @@ exit $ret %changelog +* 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 From 71059b310716f4825695f9e782ce935aa0e38779 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 23:10:45 +0000 Subject: [PATCH 22/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-sabre-dav4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 37f0791..be61a3b 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP Version: 4.6.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -224,6 +224,9 @@ exit $ret %changelog +* 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 From fc51e40d2c980ad8ec70c234b358772b88ac20b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 29 Jan 2024 11:07:16 +0000 Subject: [PATCH 23/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-sabre-dav4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index be61a3b..a994b5e 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP Version: 4.6.0 -Release: 3%{?dist} +Release: 4%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -224,6 +224,9 @@ exit $ret %changelog +* 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 From e7ae93dfd0e062c232a216c85672cdc23fe8c27b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:24:48 +0000 Subject: [PATCH 24/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-sabre-dav4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index a994b5e..d782a1b 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP Version: 4.6.0 -Release: 4%{?dist} +Release: 5%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -224,6 +224,9 @@ exit $ret %changelog +* 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 From b4cd0a0b8b591a9a61d5bb5e5aa4a5c3cc67216e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 29 Oct 2024 14:49:25 +0100 Subject: [PATCH 25/27] v4.7..0 --- .gitignore | 1 + php-sabre-dav4.spec | 15 ++++++++------- sources | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 2ba7911..78f7e10 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /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.spec b/php-sabre-dav4.spec index d782a1b..b70f0ae 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,8 +24,8 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP -Version: 4.6.0 -Release: 5%{?dist} +Version: 4.7.0 +Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -112,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) @@ -197,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 @@ -224,6 +222,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index a55f18e..1492fa3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.6.0-5541453.tgz) = ea14ac1f1b203c66d7655bc6ebbb28290dd40227b4e2a19937530510c89af1ca661c678808b63c4edbc7eb5462727ac7d39db4dde5552f7b1ab4249de203ac1c +SHA512 (php-sabre-dav4-4.7.0-074373b.tgz) = 95f6a85567c7a6fcf0d74fe13a60465ea99a8c8d5920f82a6e8a98e96e21f05ea614f607d67360f7ff2f6c2393e1d447ebd5761697f371b29ffab92051ac4aac From 469dc2ae6293651518a511504695248dc0ca6e36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:39:59 +0000 Subject: [PATCH 26/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-sabre-dav4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index b70f0ae..18630be 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP Version: 4.7.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -222,6 +222,9 @@ exit $ret %changelog +* 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 From 518c501a5a9916d58fa5ff43e89718a80644aca4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:30:14 +0000 Subject: [PATCH 27/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-sabre-dav4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 18630be..333a5f9 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP Version: 4.7.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -222,6 +222,9 @@ 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