From b319082d1ac4e69330d6e3a8843845c56d50200e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 08:17:44 +0000 Subject: [PATCH 01/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 09fad2e..3e3dbbb 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -21,7 +21,7 @@ Name: php-%{gh_project}4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.1.2 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -136,6 +136,9 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php %endif %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 4.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Jan 17 2017 Remi Collet - 4.1.2-1 - rename to php-sabre-vobject4 - raise dependency on PHP version 5.5 From 098df77f6806f26677f4a1479aa6a036a03d910e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Oct 2017 05:54:12 +0200 Subject: [PATCH 02/55] Update to 4.1.3 sources from https://github.com/sabre-io/vobject --- .gitignore | 1 + ...-bin.patch => php-sabre-vobject4-bin.patch | 0 php-sabre-vobject4.spec | 30 ++++++++++++------- sources | 2 +- 4 files changed, 22 insertions(+), 11 deletions(-) rename sabre-vobject-bin.patch => php-sabre-vobject4-bin.patch (100%) diff --git a/.gitignore b/.gitignore index 6498780..ffac39a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ clog /php-sabre-vobject4-4.1.2-d0fde2f.tar.gz +/php-sabre-vobject4-4.1.3-df99168.tar.gz diff --git a/sabre-vobject-bin.patch b/php-sabre-vobject4-bin.patch similarity index 100% rename from sabre-vobject-bin.patch rename to php-sabre-vobject4-bin.patch diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 3e3dbbb..d68becc 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -6,10 +6,10 @@ # # Please, preserve the changelog entries # -%global gh_commit d0fde2fafa2a3dad1f559c2d1c2591d4fd75ae3c +%global gh_commit df9916813d1d83e4f761c4cba13361ee74196fac %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner fruux -%global gh_project sabre-vobject +%global gh_owner sabre-io +%global gh_project vobject %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %if 0%{?fedora} > 25 @@ -18,10 +18,10 @@ %global with_cmd 0 %endif -Name: php-%{gh_project}4 +Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.1.2 -Release: 2%{?dist} +Version: 4.1.3 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -30,7 +30,7 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit Source1: %{name}-autoload.php # replace composer autloader -Patch0: %{gh_project}-bin.patch +Patch0: %{name}-bin.patch BuildArch: noarch %if %{with_tests} @@ -44,10 +44,10 @@ BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" -# "phpunit/phpunit" : "*", +# "phpunit/phpunit" : "> 4.8, <6.0.0", # "squizlabs/php_codesniffer": "*" # "sabre/cs" : "^1.0.0" -BuildRequires: php-composer(phpunit/phpunit) +BuildRequires: php-composer(phpunit/phpunit) > 4.8 # Autoloader BuildRequires: php-composer(fedora/autoloader) %endif @@ -118,7 +118,13 @@ cd tests sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php : Run upstream test suite against installed library -%{_bindir}/phpunit --verbose +ret=0 +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + $cmd %{_bindir}/phpunit --verbose || ret=1 + fi +done +exit $ret %else : Skip upstream test suite %endif @@ -136,6 +142,10 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php %endif %changelog +* Thu Oct 19 2017 Remi Collet - 4.1.3-1 +- Update to 4.1.3 +- sources from https://github.com/sabre-io/vobject + * Thu Jul 27 2017 Fedora Release Engineering - 4.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 072dba5..355b579 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.1.2-d0fde2f.tar.gz) = 55c3b3845967d03003942a81cb3cafa65bedff5bba1a6eb3148de75ddeef99488fe3ca2a176879599addfcbe08cd13e54c221d49720a456e008334e541008954 +SHA512 (php-sabre-vobject4-4.1.3-df99168.tar.gz) = 75132170b6cd1adb1359a3f9ca3069b88ef06d46200c6511be375c3d6ffd00c1cab50476990eac31a0e866866dbcc3e6433a67734a074796ee09418e9aaea550 From 2fc761df638b5cf18939e8c0be3bb58c89dd070d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Oct 2017 05:54:12 +0200 Subject: [PATCH 03/55] Update to 4.1.3 sources from https://github.com/sabre-io/vobject (cherry picked from commit 098df77f6806f26677f4a1479aa6a036a03d910e) --- .gitignore | 1 + ...-bin.patch => php-sabre-vobject4-bin.patch | 0 php-sabre-vobject4.spec | 28 +++++++++++++------ sources | 2 +- 4 files changed, 21 insertions(+), 10 deletions(-) rename sabre-vobject-bin.patch => php-sabre-vobject4-bin.patch (100%) diff --git a/.gitignore b/.gitignore index 6498780..ffac39a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ clog /php-sabre-vobject4-4.1.2-d0fde2f.tar.gz +/php-sabre-vobject4-4.1.3-df99168.tar.gz diff --git a/sabre-vobject-bin.patch b/php-sabre-vobject4-bin.patch similarity index 100% rename from sabre-vobject-bin.patch rename to php-sabre-vobject4-bin.patch diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 09fad2e..09b4b4c 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -6,10 +6,10 @@ # # Please, preserve the changelog entries # -%global gh_commit d0fde2fafa2a3dad1f559c2d1c2591d4fd75ae3c +%global gh_commit df9916813d1d83e4f761c4cba13361ee74196fac %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner fruux -%global gh_project sabre-vobject +%global gh_owner sabre-io +%global gh_project vobject %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %if 0%{?fedora} > 25 @@ -18,9 +18,9 @@ %global with_cmd 0 %endif -Name: php-%{gh_project}4 +Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.1.2 +Version: 4.1.3 Release: 1%{?dist} URL: http://sabre.io/vobject/ @@ -30,7 +30,7 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit Source1: %{name}-autoload.php # replace composer autloader -Patch0: %{gh_project}-bin.patch +Patch0: %{name}-bin.patch BuildArch: noarch %if %{with_tests} @@ -44,10 +44,10 @@ BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" -# "phpunit/phpunit" : "*", +# "phpunit/phpunit" : "> 4.8, <6.0.0", # "squizlabs/php_codesniffer": "*" # "sabre/cs" : "^1.0.0" -BuildRequires: php-composer(phpunit/phpunit) +BuildRequires: php-composer(phpunit/phpunit) > 4.8 # Autoloader BuildRequires: php-composer(fedora/autoloader) %endif @@ -118,7 +118,13 @@ cd tests sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php : Run upstream test suite against installed library -%{_bindir}/phpunit --verbose +ret=0 +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + $cmd %{_bindir}/phpunit --verbose || ret=1 + fi +done +exit $ret %else : Skip upstream test suite %endif @@ -136,6 +142,10 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php %endif %changelog +* Thu Oct 19 2017 Remi Collet - 4.1.3-1 +- Update to 4.1.3 +- sources from https://github.com/sabre-io/vobject + * Tue Jan 17 2017 Remi Collet - 4.1.2-1 - rename to php-sabre-vobject4 - raise dependency on PHP version 5.5 diff --git a/sources b/sources index 072dba5..355b579 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.1.2-d0fde2f.tar.gz) = 55c3b3845967d03003942a81cb3cafa65bedff5bba1a6eb3148de75ddeef99488fe3ca2a176879599addfcbe08cd13e54c221d49720a456e008334e541008954 +SHA512 (php-sabre-vobject4-4.1.3-df99168.tar.gz) = 75132170b6cd1adb1359a3f9ca3069b88ef06d46200c6511be375c3d6ffd00c1cab50476990eac31a0e866866dbcc3e6433a67734a074796ee09418e9aaea550 From 9c5b9af50877d1ad92f0ed2bf7868be5b5a0a91f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 30 Oct 2017 13:28:19 +0100 Subject: [PATCH 04/55] fix FTBFS fro mKoschei, add patch for test from https://github.com/sabre-io/vobject/pull/395 --- 395.patch | 21 +++++++++++++++++++++ php-sabre-vobject4.spec | 9 ++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 395.patch diff --git a/395.patch b/395.patch new file mode 100644 index 0000000..0e6c5a7 --- /dev/null +++ b/395.patch @@ -0,0 +1,21 @@ +From f70b5b5c7113c8781c1fb208a89093315be942da Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Mon, 30 Oct 2017 13:21:53 +0100 +Subject: [PATCH] Canada/East-Saskatchewan removed in 2017.3 + +--- + lib/timezonedata/php-bc.php | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/lib/timezonedata/php-bc.php b/lib/timezonedata/php-bc.php +index 906ccb0e..83f38f50 100644 +--- a/lib/timezonedata/php-bc.php ++++ b/lib/timezonedata/php-bc.php +@@ -68,7 +68,6 @@ + 'Brazil/West', + 'Canada/Atlantic', + 'Canada/Central', +- 'Canada/East-Saskatchewan', + 'Canada/Eastern', + 'Canada/Mountain', + 'Canada/Newfoundland', diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index d68becc..bcde632 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -21,7 +21,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.1.3 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -31,6 +31,7 @@ Source1: %{name}-autoload.php # replace composer autloader Patch0: %{name}-bin.patch +Patch1: https://patch-diff.githubusercontent.com/raw/sabre-io/vobject/pull/395.patch BuildArch: noarch %if %{with_tests} @@ -90,6 +91,8 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm +%patch1 -p1 -b .pr395 + cp %{SOURCE1} lib/autoload.php @@ -142,6 +145,10 @@ exit $ret %endif %changelog +* Mon Oct 30 2017 Remi Collet - 4.1.3-2 +- fix FTBFS fro mKoschei, add patch for test from + https://github.com/sabre-io/vobject/pull/395 + * Thu Oct 19 2017 Remi Collet - 4.1.3-1 - Update to 4.1.3 - sources from https://github.com/sabre-io/vobject From fedb85695c592a47f6bb0e784acbf9418cb97c62 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 23 Dec 2017 07:18:01 +0100 Subject: [PATCH 05/55] v4.1.4 --- .gitignore | 1 + 395.patch | 21 --------------------- php-sabre-vobject4.spec | 15 ++++++++------- sources | 2 +- 4 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 395.patch diff --git a/.gitignore b/.gitignore index ffac39a..1ee8518 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ clog /php-sabre-vobject4-4.1.2-d0fde2f.tar.gz /php-sabre-vobject4-4.1.3-df99168.tar.gz +/php-sabre-vobject4-4.1.4-6484b9d.tar.gz diff --git a/395.patch b/395.patch deleted file mode 100644 index 0e6c5a7..0000000 --- a/395.patch +++ /dev/null @@ -1,21 +0,0 @@ -From f70b5b5c7113c8781c1fb208a89093315be942da Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Mon, 30 Oct 2017 13:21:53 +0100 -Subject: [PATCH] Canada/East-Saskatchewan removed in 2017.3 - ---- - lib/timezonedata/php-bc.php | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/lib/timezonedata/php-bc.php b/lib/timezonedata/php-bc.php -index 906ccb0e..83f38f50 100644 ---- a/lib/timezonedata/php-bc.php -+++ b/lib/timezonedata/php-bc.php -@@ -68,7 +68,6 @@ - 'Brazil/West', - 'Canada/Atlantic', - 'Canada/Central', -- 'Canada/East-Saskatchewan', - 'Canada/Eastern', - 'Canada/Mountain', - 'Canada/Newfoundland', diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index bcde632..5f35c26 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit df9916813d1d83e4f761c4cba13361ee74196fac +%global gh_commit 6484b9d660822c5e221c76122ce8ea658ecc9c5b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -20,8 +20,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.1.3 -Release: 2%{?dist} +Version: 4.1.4 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -31,7 +31,6 @@ Source1: %{name}-autoload.php # replace composer autloader Patch0: %{name}-bin.patch -Patch1: https://patch-diff.githubusercontent.com/raw/sabre-io/vobject/pull/395.patch BuildArch: noarch %if %{with_tests} @@ -45,10 +44,10 @@ BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" -# "phpunit/phpunit" : "> 4.8, <6.0.0", +# "phpunit/phpunit" : "> 4.8.35, <6.0.0", # "squizlabs/php_codesniffer": "*" # "sabre/cs" : "^1.0.0" -BuildRequires: php-composer(phpunit/phpunit) > 4.8 +BuildRequires: php-composer(phpunit/phpunit) > 4.8.35 # Autoloader BuildRequires: php-composer(fedora/autoloader) %endif @@ -91,7 +90,6 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm -%patch1 -p1 -b .pr395 cp %{SOURCE1} lib/autoload.php @@ -145,6 +143,9 @@ exit $ret %endif %changelog +* Sat Dec 23 2017 Remi Collet - 4.1.4-1 +- Update to 4.1.4 + * Mon Oct 30 2017 Remi Collet - 4.1.3-2 - fix FTBFS fro mKoschei, add patch for test from https://github.com/sabre-io/vobject/pull/395 diff --git a/sources b/sources index 355b579..159221a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.1.3-df99168.tar.gz) = 75132170b6cd1adb1359a3f9ca3069b88ef06d46200c6511be375c3d6ffd00c1cab50476990eac31a0e866866dbcc3e6433a67734a074796ee09418e9aaea550 +SHA512 (php-sabre-vobject4-4.1.4-6484b9d.tar.gz) = 7d5bd6d343050835f87f64a37fdcbb8af8444bc76cc6b9a4a0ebbf1c9935f4e5db43e3e6db45f5989492f3a105a2a4382b470a16e23fa127b29efc7e7b8f7870 From 99312e43ab2277c4680d65f5401eb8b3ffb876a0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 04:32:46 +0000 Subject: [PATCH 06/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 5f35c26..51a16c4 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -21,7 +21,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.1.4 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -143,6 +143,9 @@ exit $ret %endif %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 4.1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Dec 23 2017 Remi Collet - 4.1.4-1 - Update to 4.1.4 From ed24b462127482e36bc12f359f5d1e2aeef04553 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 9 Mar 2018 07:09:10 +0100 Subject: [PATCH 07/55] update to 4.1.5 use range dependencies on F27+ --- .gitignore | 1 + php-sabre-vobject4.spec | 24 ++++++++++++++++++------ sources | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 1ee8518..48e4128 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /php-sabre-vobject4-4.1.2-d0fde2f.tar.gz /php-sabre-vobject4-4.1.3-df99168.tar.gz /php-sabre-vobject4-4.1.4-6484b9d.tar.gz +/php-sabre-vobject4-4.1.5-0928660.tar.gz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 51a16c4..89d6579 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -1,18 +1,18 @@ # remirepo/fedora spec file for php-sabre-vobject4 # -# Copyright (c) 2013-2017 Remi Collet +# Copyright (c) 2013-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit 6484b9d660822c5e221c76122ce8ea658ecc9c5b +%global gh_commit 0928660e92d46d2d24336a6db320636aa3a75414 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject %global with_tests %{?_without_tests:0}%{!?_without_tests:1} -%if 0%{?fedora} > 25 +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 %global with_cmd 1 %else %global with_cmd 0 @@ -20,8 +20,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.1.4 -Release: 2%{?dist} +Version: 4.1.5 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -36,8 +36,12 @@ BuildArch: noarch %if %{with_tests} BuildRequires: php(language) >= 5.5 BuildRequires: php-mbstring +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(sabre/xml) >= 1.5 with php-composer(sabre/xml) < 3) +%else BuildRequires: php-composer(sabre/xml) < 3 BuildRequires: php-composer(sabre/xml) >= 1.5 +%endif BuildRequires: php-date BuildRequires: php-json BuildRequires: php-pcre @@ -58,8 +62,12 @@ BuildRequires: php-composer(fedora/autoloader) # "sabre/xml" : ">=1.5 <3.0" Requires: php(language) >= 5.5 Requires: php-mbstring +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(sabre/xml) >= 1.5 with php-composer(sabre/xml) < 3) +%else Requires: php-composer(sabre/xml) >= 1.5 Requires: php-composer(sabre/xml) < 3 +%endif # From phpcompatinfo report for version 4.1.2 %if %{with_cmd} Requires: php-cli @@ -120,7 +128,7 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php : Run upstream test suite against installed library ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php70 php71 php72; do if which $cmd; then $cmd %{_bindir}/phpunit --verbose || ret=1 fi @@ -143,6 +151,10 @@ exit $ret %endif %changelog +* Fri Mar 9 2018 Remi Collet - 4.1.5-1 +- update to 4.1.5 +- use range dependencies on F27+ + * Fri Feb 09 2018 Fedora Release Engineering - 4.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 159221a..ef97d6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.1.4-6484b9d.tar.gz) = 7d5bd6d343050835f87f64a37fdcbb8af8444bc76cc6b9a4a0ebbf1c9935f4e5db43e3e6db45f5989492f3a105a2a4382b470a16e23fa127b29efc7e7b8f7870 +SHA512 (php-sabre-vobject4-4.1.5-0928660.tar.gz) = 92dca982c4573791e37ddc139d865af27b2aa64a9a33c19fd59d7deb82dd3e3286a903ea9ae3f941a3f754d1fd31290ad7211b7ca80eb2d4e48a6e062a47cb3c From 2a6b431f93184e907c7a4d0890bf5d4d8dfc3c11 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 20 Apr 2018 09:40:06 +0200 Subject: [PATCH 08/55] update to 4.1.6 undefine __brp_mangle_shebangs --- .gitignore | 1 + php-sabre-vobject4.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 48e4128..7e57c5c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ clog /php-sabre-vobject4-4.1.3-df99168.tar.gz /php-sabre-vobject4-4.1.4-6484b9d.tar.gz /php-sabre-vobject4-4.1.5-0928660.tar.gz +/php-sabre-vobject4-4.1.6-122cacb.tar.gz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 89d6579..f35ecf4 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -6,7 +6,11 @@ # # Please, preserve the changelog entries # -%global gh_commit 0928660e92d46d2d24336a6db320636aa3a75414 + +# For compatibility with SCL +%undefine __brp_mangle_shebangs + +%global gh_commit 122cacbdea2c6133ac04db86ec05854beef75adf %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -20,12 +24,11 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.1.5 +Version: 4.1.6 Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD -Group: Development/Libraries Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz Source1: %{name}-autoload.php @@ -151,6 +154,10 @@ exit $ret %endif %changelog +* Fri Apr 20 2018 Remi Collet - 4.1.6-1 +- update to 4.1.6 +- undefine __brp_mangle_shebangs + * Fri Mar 9 2018 Remi Collet - 4.1.5-1 - update to 4.1.5 - use range dependencies on F27+ diff --git a/sources b/sources index ef97d6d..625aee0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.1.5-0928660.tar.gz) = 92dca982c4573791e37ddc139d865af27b2aa64a9a33c19fd59d7deb82dd3e3286a903ea9ae3f941a3f754d1fd31290ad7211b7ca80eb2d4e48a6e062a47cb3c +SHA512 (php-sabre-vobject4-4.1.6-122cacb.tar.gz) = 6f3233bdf7c079949e6003df68f0ca0b1a946374e3bc676370eecc853e7cca51924b286ebf04facfd0793a2de6b3ede2e82f40de2fce9d38979a2769e0089218 From 61f4eac37a74d6ffe85599089f250ec088fb125a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 22:07:06 +0000 Subject: [PATCH 09/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index f35ecf4..1831551 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -25,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.1.6 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -154,6 +154,9 @@ exit $ret %endif %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 4.1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Apr 20 2018 Remi Collet - 4.1.6-1 - update to 4.1.6 - undefine __brp_mangle_shebangs From 2ae21c42ec874304016c8d609233737c1f8e03e1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 15 Oct 2018 10:36:20 +0200 Subject: [PATCH 10/55] add upstream patch for PHP 7.3 --- ...d42e17e058237f0350ca56c7f01903bb035e.patch | 90 +++++++++++++++++++ php-sabre-vobject4.spec | 10 ++- 2 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 c533d42e17e058237f0350ca56c7f01903bb035e.patch diff --git a/c533d42e17e058237f0350ca56c7f01903bb035e.patch b/c533d42e17e058237f0350ca56c7f01903bb035e.patch new file mode 100644 index 0000000..d6bef41 --- /dev/null +++ b/c533d42e17e058237f0350ca56c7f01903bb035e.patch @@ -0,0 +1,90 @@ +From c533d42e17e058237f0350ca56c7f01903bb035e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20M=C3=BCller?= + +Date: Tue, 25 Sep 2018 20:42:40 +0200 +Subject: [PATCH] Test with php 7.3 on travis (#424) + +--- + .travis.yml | 13 ++++++++++++- + lib/Component/VCard.php | 2 +- + lib/FreeBusyGenerator.php | 2 +- + tests/VObject/BirthdayCalendarGeneratorTest.php | 4 ++-- + 4 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/.travis.yml b/.travis.yml +index 531ad5be..1637f2e2 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -1,12 +1,19 @@ + language: php ++sudo: required ++dist: xenial + php: + - 5.5 + - 5.6 + - 7.0 + - 7.1 + - 7.2 ++ - 7.3snapshot + +-sudo: false ++addons: ++ apt: ++ packages: ++ # required for php7.3 ++ - libzip4 + + script: + - ./bin/phpunit --configuration tests/phpunit.xml +@@ -18,3 +25,7 @@ before_script: + cache: + directories: + - $HOME/.composer/cache ++ ++matrix: ++ allow_failures: ++ - php: 5.5 +diff --git a/lib/Component/VCard.php b/lib/Component/VCard.php +index bca623d5..2a2851f4 100644 +--- a/lib/Component/VCard.php ++++ b/lib/Component/VCard.php +@@ -511,7 +511,7 @@ function xmlSerialize(Xml\Writer $writer) { + switch ($property->name) { + + case 'VERSION': +- continue; ++ break; + + case 'XML': + $value = $property->getParts(); +diff --git a/lib/FreeBusyGenerator.php b/lib/FreeBusyGenerator.php +index e30b136c..ca77cb91 100644 +--- a/lib/FreeBusyGenerator.php ++++ b/lib/FreeBusyGenerator.php +@@ -430,7 +430,7 @@ protected function calculateBusy(FreeBusyData $fbData, array $objects) { + // instance. We are skipping this event from the output + // entirely. + unset($this->objects[$key]); +- continue; ++ break; + } + + if ($this->start) { +diff --git a/tests/VObject/BirthdayCalendarGeneratorTest.php b/tests/VObject/BirthdayCalendarGeneratorTest.php +index 6d729b65..812641fc 100644 +--- a/tests/VObject/BirthdayCalendarGeneratorTest.php ++++ b/tests/VObject/BirthdayCalendarGeneratorTest.php +@@ -475,11 +475,11 @@ function testVcardStringWithEmptyBirthdayProperty() { + function testParseException() { + + $generator = new BirthdayCalendarGenerator(); +- $input = <<setObjects($input); + diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 1831551..245c816 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -25,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.1.6 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -34,6 +34,8 @@ Source1: %{name}-autoload.php # replace composer autloader Patch0: %{name}-bin.patch +# Upstream patch +Patch1: https://github.com/remicollet/vobject/commit/c533d42e17e058237f0350ca56c7f01903bb035e.patch BuildArch: noarch %if %{with_tests} @@ -101,6 +103,7 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm +%patch1 -p1 cp %{SOURCE1} lib/autoload.php @@ -131,7 +134,7 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php : Run upstream test suite against installed library ret=0 -for cmd in php php70 php71 php72; do +for cmd in php php70 php71 php72 php73; do if which $cmd; then $cmd %{_bindir}/phpunit --verbose || ret=1 fi @@ -154,6 +157,9 @@ exit $ret %endif %changelog +* Mon Oct 15 2018 Remi Collet - 4.1.6-3 +- add upstream patch for PHP 7.3 + * Fri Jul 13 2018 Fedora Release Engineering - 4.1.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 3119397a8e975280df0d93fab66033796d1edc17 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 03:40:20 +0000 Subject: [PATCH 11/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 245c816..b46223a 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -25,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.1.6 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -157,6 +157,9 @@ exit $ret %endif %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 4.1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Oct 15 2018 Remi Collet - 4.1.6-3 - add upstream patch for PHP 7.3 From b6eac285fed60eaf80c00e5e4883d845b84e23df Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 20 Feb 2019 07:28:11 +0100 Subject: [PATCH 12/55] v4.2.0 --- .gitignore | 1 + ...d42e17e058237f0350ca56c7f01903bb035e.patch | 90 ------------------- php-sabre-vobject4-bin.patch | 20 ++--- php-sabre-vobject4.spec | 18 ++-- sources | 2 +- 5 files changed, 20 insertions(+), 111 deletions(-) delete mode 100644 c533d42e17e058237f0350ca56c7f01903bb035e.patch diff --git a/.gitignore b/.gitignore index 7e57c5c..74a1b63 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ clog /php-sabre-vobject4-4.1.4-6484b9d.tar.gz /php-sabre-vobject4-4.1.5-0928660.tar.gz /php-sabre-vobject4-4.1.6-122cacb.tar.gz +/php-sabre-vobject4-4.2.0-bd50001.tar.gz diff --git a/c533d42e17e058237f0350ca56c7f01903bb035e.patch b/c533d42e17e058237f0350ca56c7f01903bb035e.patch deleted file mode 100644 index d6bef41..0000000 --- a/c533d42e17e058237f0350ca56c7f01903bb035e.patch +++ /dev/null @@ -1,90 +0,0 @@ -From c533d42e17e058237f0350ca56c7f01903bb035e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20M=C3=BCller?= - -Date: Tue, 25 Sep 2018 20:42:40 +0200 -Subject: [PATCH] Test with php 7.3 on travis (#424) - ---- - .travis.yml | 13 ++++++++++++- - lib/Component/VCard.php | 2 +- - lib/FreeBusyGenerator.php | 2 +- - tests/VObject/BirthdayCalendarGeneratorTest.php | 4 ++-- - 4 files changed, 16 insertions(+), 5 deletions(-) - -diff --git a/.travis.yml b/.travis.yml -index 531ad5be..1637f2e2 100644 ---- a/.travis.yml -+++ b/.travis.yml -@@ -1,12 +1,19 @@ - language: php -+sudo: required -+dist: xenial - php: - - 5.5 - - 5.6 - - 7.0 - - 7.1 - - 7.2 -+ - 7.3snapshot - --sudo: false -+addons: -+ apt: -+ packages: -+ # required for php7.3 -+ - libzip4 - - script: - - ./bin/phpunit --configuration tests/phpunit.xml -@@ -18,3 +25,7 @@ before_script: - cache: - directories: - - $HOME/.composer/cache -+ -+matrix: -+ allow_failures: -+ - php: 5.5 -diff --git a/lib/Component/VCard.php b/lib/Component/VCard.php -index bca623d5..2a2851f4 100644 ---- a/lib/Component/VCard.php -+++ b/lib/Component/VCard.php -@@ -511,7 +511,7 @@ function xmlSerialize(Xml\Writer $writer) { - switch ($property->name) { - - case 'VERSION': -- continue; -+ break; - - case 'XML': - $value = $property->getParts(); -diff --git a/lib/FreeBusyGenerator.php b/lib/FreeBusyGenerator.php -index e30b136c..ca77cb91 100644 ---- a/lib/FreeBusyGenerator.php -+++ b/lib/FreeBusyGenerator.php -@@ -430,7 +430,7 @@ protected function calculateBusy(FreeBusyData $fbData, array $objects) { - // instance. We are skipping this event from the output - // entirely. - unset($this->objects[$key]); -- continue; -+ break; - } - - if ($this->start) { -diff --git a/tests/VObject/BirthdayCalendarGeneratorTest.php b/tests/VObject/BirthdayCalendarGeneratorTest.php -index 6d729b65..812641fc 100644 ---- a/tests/VObject/BirthdayCalendarGeneratorTest.php -+++ b/tests/VObject/BirthdayCalendarGeneratorTest.php -@@ -475,11 +475,11 @@ function testVcardStringWithEmptyBirthdayProperty() { - function testParseException() { - - $generator = new BirthdayCalendarGenerator(); -- $input = <<setObjects($input); - diff --git a/php-sabre-vobject4-bin.patch b/php-sabre-vobject4-bin.patch index 79ed1a5..e37bd2a 100644 --- a/php-sabre-vobject4-bin.patch +++ b/php-sabre-vobject4-bin.patch @@ -1,6 +1,6 @@ diff -up ./bin/generate_vcards.rpm ./bin/generate_vcards ---- ./bin/generate_vcards.rpm 2017-01-17 14:09:13.368837753 +0100 -+++ ./bin/generate_vcards 2017-01-17 14:12:49.417890498 +0100 +--- ./bin/generate_vcards.rpm 2019-02-19 14:05:37.000000000 +0100 ++++ ./bin/generate_vcards 2019-02-20 07:21:38.282053251 +0100 @@ -6,8 +6,7 @@ namespace Sabre\VObject; // This sucks.. we have to try to find the composer autoloader. But chances // are, we can't find it this way. So we'll do our bestest @@ -21,8 +21,8 @@ diff -up ./bin/generate_vcards.rpm ./bin/generate_vcards } diff -up ./bin/vobject.rpm ./bin/vobject ---- ./bin/vobject.rpm 2017-01-17 14:12:09.586696412 +0100 -+++ ./bin/vobject 2017-01-17 14:12:40.301846078 +0100 +--- ./bin/vobject.rpm 2019-02-19 14:05:37.000000000 +0100 ++++ ./bin/vobject 2019-02-20 07:21:38.282053251 +0100 @@ -6,8 +6,7 @@ namespace Sabre\VObject; // This sucks.. we have to try to find the composer autoloader. But chances // are, we can't find it this way. So we'll do our bestest @@ -43,14 +43,14 @@ diff -up ./bin/vobject.rpm ./bin/vobject } diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2016-12-06 05:14:09.000000000 +0100 -+++ ./tests/bootstrap.php 2017-01-17 14:14:50.960482740 +0100 +--- ./tests/bootstrap.php.rpm 2019-02-20 07:21:38.282053251 +0100 ++++ ./tests/bootstrap.php 2019-02-20 07:22:58.069649015 +0100 @@ -3,8 +3,7 @@ date_default_timezone_set('UTC'); $try = [ -- __DIR__ . '/../vendor/autoload.php', -- __DIR__ . '/../../../autoload.php', +- __DIR__.'/../vendor/autoload.php', +- __DIR__.'/../../../autoload.php', + '@BUILDROOT@/usr/share/php/Sabre/VObject4/autoload.php', // RPM installation ]; @@ -59,8 +59,8 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php } } --$autoLoader->addPsr4('Sabre\\VObject\\', __DIR__ . '/VObject'); +-$autoLoader->addPsr4('Sabre\\VObject\\', __DIR__.'/VObject'); +\Fedora\Autoloader\Autoload::addPsr4('Sabre\\VObject\\', __DIR__ . '/VObject'); if (!defined('SABRE_TEMPDIR')) { - define('SABRE_TEMPDIR', __DIR__ . '/temp/'); + define('SABRE_TEMPDIR', __DIR__.'/temp/'); diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index b46223a..0f22ab8 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-sabre-vobject4 # -# Copyright (c) 2013-2018 Remi Collet +# Copyright (c) 2013-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 122cacbdea2c6133ac04db86ec05854beef75adf +%global gh_commit bd500019764e434ff65872d426f523e7882a0739 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -24,8 +24,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.1.6 -Release: 4%{?dist} +Version: 4.2.0 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -34,8 +34,6 @@ Source1: %{name}-autoload.php # replace composer autloader Patch0: %{name}-bin.patch -# Upstream patch -Patch1: https://github.com/remicollet/vobject/commit/c533d42e17e058237f0350ca56c7f01903bb035e.patch BuildArch: noarch %if %{with_tests} @@ -53,9 +51,7 @@ BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" -# "phpunit/phpunit" : "> 4.8.35, <6.0.0", -# "squizlabs/php_codesniffer": "*" -# "sabre/cs" : "^1.0.0" +# "phpunit/phpunit" : "> 4.8.35, <6.0.0" BuildRequires: php-composer(phpunit/phpunit) > 4.8.35 # Autoloader BuildRequires: php-composer(fedora/autoloader) @@ -103,7 +99,6 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm -%patch1 -p1 cp %{SOURCE1} lib/autoload.php @@ -157,6 +152,9 @@ exit $ret %endif %changelog +* Wed Feb 20 2019 Remi Collet - 4.2.0-1 +- update to 4.2.0 + * Sat Feb 02 2019 Fedora Release Engineering - 4.1.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 625aee0..cf8306c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.1.6-122cacb.tar.gz) = 6f3233bdf7c079949e6003df68f0ca0b1a946374e3bc676370eecc853e7cca51924b286ebf04facfd0793a2de6b3ede2e82f40de2fce9d38979a2769e0089218 +SHA512 (php-sabre-vobject4-4.2.0-bd50001.tar.gz) = 5045330bf3b77812e4f3bd4492be615cc48c12f650554cc10385c3a490746deb797560f3b4208400865229d6f9380cf106a302ba9f3fd7c59ca0cb51ccdd2644 From 8aef5ab3b193a28b7966f16e976df88676fdf0cd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 5 Jul 2019 13:28:16 +0200 Subject: [PATCH 13/55] fix autoloader for sabre/xml version 2 --- php-sabre-vobject4-autoload.php | 5 ++++- php-sabre-vobject4.spec | 18 ++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/php-sabre-vobject4-autoload.php b/php-sabre-vobject4-autoload.php index 427a243..71664f5 100644 --- a/php-sabre-vobject4-autoload.php +++ b/php-sabre-vobject4-autoload.php @@ -5,6 +5,9 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Sabre\\VObject\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ - '/usr/share/php/Sabre/Xml/autoload.php', + [ + '/usr/share/php/Sabre/Xml2/autoload.php', + '/usr/share/php/Sabre/Xml/autoload.php', + ], ]); diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 0f22ab8..a5c1b96 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -25,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.2.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -39,12 +39,7 @@ BuildArch: noarch %if %{with_tests} BuildRequires: php(language) >= 5.5 BuildRequires: php-mbstring -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(sabre/xml) >= 1.5 with php-composer(sabre/xml) < 3) -%else -BuildRequires: php-composer(sabre/xml) < 3 -BuildRequires: php-composer(sabre/xml) >= 1.5 -%endif BuildRequires: php-date BuildRequires: php-json BuildRequires: php-pcre @@ -63,12 +58,8 @@ BuildRequires: php-composer(fedora/autoloader) # "sabre/xml" : ">=1.5 <3.0" Requires: php(language) >= 5.5 Requires: php-mbstring -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +# Requires: (php-composer(sabre/xml) >= 1.5 with php-composer(sabre/xml) < 3) -%else -Requires: php-composer(sabre/xml) >= 1.5 -Requires: php-composer(sabre/xml) < 3 -%endif # From phpcompatinfo report for version 4.1.2 %if %{with_cmd} Requires: php-cli @@ -129,7 +120,7 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php : Run upstream test suite against installed library ret=0 -for cmd in php php70 php71 php72 php73; do +for cmd in php php71 php72 php73 php74; do if which $cmd; then $cmd %{_bindir}/phpunit --verbose || ret=1 fi @@ -152,6 +143,9 @@ exit $ret %endif %changelog +* Mon Jul 1 2019 Remi Collet - 4.2.0-2 +- fix autoloader for sabre/xml version 2 + * Wed Feb 20 2019 Remi Collet - 4.2.0-1 - update to 4.2.0 From 2c04921e94df84c61d6955de300ce056852bffd1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 10:08:19 +0000 Subject: [PATCH 14/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index a5c1b96..c8503d2 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -25,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.2.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -143,6 +143,9 @@ exit $ret %endif %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 4.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Jul 1 2019 Remi Collet - 4.2.0-2 - fix autoloader for sabre/xml version 2 From 9d72914749f9262ece046a2cf960acf291c6a6c9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Oct 2019 09:21:12 +0200 Subject: [PATCH 15/55] add patch for PHP 7.4 from https://github.com/sabre-io/vobject/pull/469 --- 469.patch | 22 ++++++++++++++++++++++ php-sabre-vobject4.spec | 8 +++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 469.patch diff --git a/469.patch b/469.patch new file mode 100644 index 0000000..eae0b20 --- /dev/null +++ b/469.patch @@ -0,0 +1,22 @@ +From 785981177a296b855d7318e87e095a0ea56f9715 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Wed, 9 Oct 2019 09:11:46 +0200 +Subject: [PATCH] fix Bad file descriptor (7.4) + +--- + tests/VObject/Parser/MimeDirTest.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/VObject/Parser/MimeDirTest.php b/tests/VObject/Parser/MimeDirTest.php +index 671c2306..30906885 100644 +--- a/tests/VObject/Parser/MimeDirTest.php ++++ b/tests/VObject/Parser/MimeDirTest.php +@@ -16,7 +16,7 @@ class MimeDirTest extends TestCase + public function testParseError() + { + $mimeDir = new MimeDir(); +- $mimeDir->parse(fopen(__FILE__, 'a')); ++ $mimeDir->parse(fopen(__FILE__, 'a+')); + } + + public function testDecodeLatin1() diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index c8503d2..78cd3f9 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -25,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.2.0 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -34,6 +34,7 @@ Source1: %{name}-autoload.php # replace composer autloader Patch0: %{name}-bin.patch +Patch1: https://patch-diff.githubusercontent.com/raw/sabre-io/vobject/pull/469.patch BuildArch: noarch %if %{with_tests} @@ -90,6 +91,7 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm +%patch1 -p1 -b .pr469 cp %{SOURCE1} lib/autoload.php @@ -143,6 +145,10 @@ exit $ret %endif %changelog +* Mon Oct 9 2019 Remi Collet - 4.2.0-4 +- add patch for PHP 7.4 from + https://github.com/sabre-io/vobject/pull/469 + * Fri Jul 26 2019 Fedora Release Engineering - 4.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 1f8c518f3653a53835c91d9a7701c0d5904c90fa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Dec 2019 11:50:30 +0100 Subject: [PATCH 16/55] update to 4.2.1 drop patch merged upstream --- .gitignore | 1 + 469.patch | 22 ---------------------- php-sabre-vobject4.spec | 12 +++++++----- sources | 2 +- 4 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 469.patch diff --git a/.gitignore b/.gitignore index 74a1b63..6154e9a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ clog /php-sabre-vobject4-4.1.5-0928660.tar.gz /php-sabre-vobject4-4.1.6-122cacb.tar.gz /php-sabre-vobject4-4.2.0-bd50001.tar.gz +/php-sabre-vobject4-4.2.1-6d7476f.tar.gz diff --git a/469.patch b/469.patch deleted file mode 100644 index eae0b20..0000000 --- a/469.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 785981177a296b855d7318e87e095a0ea56f9715 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Wed, 9 Oct 2019 09:11:46 +0200 -Subject: [PATCH] fix Bad file descriptor (7.4) - ---- - tests/VObject/Parser/MimeDirTest.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/VObject/Parser/MimeDirTest.php b/tests/VObject/Parser/MimeDirTest.php -index 671c2306..30906885 100644 ---- a/tests/VObject/Parser/MimeDirTest.php -+++ b/tests/VObject/Parser/MimeDirTest.php -@@ -16,7 +16,7 @@ class MimeDirTest extends TestCase - public function testParseError() - { - $mimeDir = new MimeDir(); -- $mimeDir->parse(fopen(__FILE__, 'a')); -+ $mimeDir->parse(fopen(__FILE__, 'a+')); - } - - public function testDecodeLatin1() diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 78cd3f9..3cbdffb 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit bd500019764e434ff65872d426f523e7882a0739 +%global gh_commit 6d7476fbd227ae285029c19ad518cd451336038c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -24,8 +24,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.2.0 -Release: 4%{?dist} +Version: 4.2.1 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -34,7 +34,6 @@ Source1: %{name}-autoload.php # replace composer autloader Patch0: %{name}-bin.patch -Patch1: https://patch-diff.githubusercontent.com/raw/sabre-io/vobject/pull/469.patch BuildArch: noarch %if %{with_tests} @@ -91,7 +90,6 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm -%patch1 -p1 -b .pr469 cp %{SOURCE1} lib/autoload.php @@ -145,6 +143,10 @@ exit $ret %endif %changelog +* Thu Dec 19 2019 Remi Collet - 4.2.1-1 +- update to 4.2.1 +- drop patch merged upstream + * Mon Oct 9 2019 Remi Collet - 4.2.0-4 - add patch for PHP 7.4 from https://github.com/sabre-io/vobject/pull/469 diff --git a/sources b/sources index cf8306c..4b66d6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.2.0-bd50001.tar.gz) = 5045330bf3b77812e4f3bd4492be615cc48c12f650554cc10385c3a490746deb797560f3b4208400865229d6f9380cf106a302ba9f3fd7c59ca0cb51ccdd2644 +SHA512 (php-sabre-vobject4-4.2.1-6d7476f.tar.gz) = c5b486912a2f7b6099217e18316845f254cb429d44c01211b59abff9f1cbc60febe1deba11638fe9116aa05e37d1ac31fb9f3d59f3cf5f2cf77fd892fe1ce0d5 From 20803b65f1684dd0a276de0e65603b1a1d655f85 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Dec 2019 12:06:37 +0100 Subject: [PATCH 17/55] skip 1 test on 32 bit --- php-sabre-vobject4.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 3cbdffb..c6d80c3 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -118,11 +118,16 @@ install -Dpm 0755 bin/generate_vcards \ cd tests sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php +opt="--verbose" +if [ $(php -r 'echo PHP_INT_SIZE;') -lt 8 ]; then + opt="--filter '^((?!(testNeverEnding)).)*$' $opt" +fi + : Run upstream test suite against installed library ret=0 for cmd in php php71 php72 php73 php74; do if which $cmd; then - $cmd %{_bindir}/phpunit --verbose || ret=1 + $cmd %{_bindir}/phpunit $opt || ret=1 fi done exit $ret From b3c6d4162cb9d9821bfbd2321add72bb43f8bdcb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Dec 2019 12:07:16 +0100 Subject: [PATCH 18/55] update changelog --- php-sabre-vobject4.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index c6d80c3..9f90835 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -151,8 +151,10 @@ exit $ret * Thu Dec 19 2019 Remi Collet - 4.2.1-1 - update to 4.2.1 - drop patch merged upstream +- skip 1 test failing on 32-bit + https://github.com/sabre-io/vobject/issues/481 -* Mon Oct 9 2019 Remi Collet - 4.2.0-4 +* Wed Oct 9 2019 Remi Collet - 4.2.0-4 - add patch for PHP 7.4 from https://github.com/sabre-io/vobject/pull/469 From b2bf57757e456bcffb5ef98ae45d2d5fc77e96e1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Jan 2020 14:19:34 +0100 Subject: [PATCH 19/55] v4.2.2 --- .gitignore | 1 + php-sabre-vobject4-bin.patch | 18 +++++++++--------- php-sabre-vobject4.spec | 7 +++++-- sources | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 6154e9a..d08f6a4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ clog /php-sabre-vobject4-4.1.6-122cacb.tar.gz /php-sabre-vobject4-4.2.0-bd50001.tar.gz /php-sabre-vobject4-4.2.1-6d7476f.tar.gz +/php-sabre-vobject4-4.2.2-449616b.tar.gz diff --git a/php-sabre-vobject4-bin.patch b/php-sabre-vobject4-bin.patch index e37bd2a..96e112d 100644 --- a/php-sabre-vobject4-bin.patch +++ b/php-sabre-vobject4-bin.patch @@ -1,6 +1,6 @@ diff -up ./bin/generate_vcards.rpm ./bin/generate_vcards ---- ./bin/generate_vcards.rpm 2019-02-19 14:05:37.000000000 +0100 -+++ ./bin/generate_vcards 2019-02-20 07:21:38.282053251 +0100 +--- ./bin/generate_vcards.rpm 2020-01-14 11:18:45.000000000 +0100 ++++ ./bin/generate_vcards 2020-01-14 14:13:58.718903396 +0100 @@ -6,8 +6,7 @@ namespace Sabre\VObject; // This sucks.. we have to try to find the composer autoloader. But chances // are, we can't find it this way. So we'll do our bestest @@ -21,8 +21,8 @@ diff -up ./bin/generate_vcards.rpm ./bin/generate_vcards } diff -up ./bin/vobject.rpm ./bin/vobject ---- ./bin/vobject.rpm 2019-02-19 14:05:37.000000000 +0100 -+++ ./bin/vobject 2019-02-20 07:21:38.282053251 +0100 +--- ./bin/vobject.rpm 2020-01-14 11:18:45.000000000 +0100 ++++ ./bin/vobject 2020-01-14 14:13:58.718903396 +0100 @@ -6,8 +6,7 @@ namespace Sabre\VObject; // This sucks.. we have to try to find the composer autoloader. But chances // are, we can't find it this way. So we'll do our bestest @@ -43,8 +43,8 @@ diff -up ./bin/vobject.rpm ./bin/vobject } diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2019-02-20 07:21:38.282053251 +0100 -+++ ./tests/bootstrap.php 2019-02-20 07:22:58.069649015 +0100 +--- ./tests/bootstrap.php.rpm 2020-01-14 11:18:45.000000000 +0100 ++++ ./tests/bootstrap.php 2020-01-14 14:15:34.557472825 +0100 @@ -3,8 +3,7 @@ date_default_timezone_set('UTC'); @@ -55,12 +55,12 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ]; foreach ($try as $path) { -@@ -14,7 +13,7 @@ foreach ($try as $path) { +@@ -14,6 +13,8 @@ foreach ($try as $path) { } } --$autoLoader->addPsr4('Sabre\\VObject\\', __DIR__.'/VObject'); +\Fedora\Autoloader\Autoload::addPsr4('Sabre\\VObject\\', __DIR__ . '/VObject'); - ++ if (!defined('SABRE_TEMPDIR')) { define('SABRE_TEMPDIR', __DIR__.'/temp/'); + } diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 9f90835..c71d48e 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 6d7476fbd227ae285029c19ad518cd451336038c +%global gh_commit 449616b2d45b95c8973975de23f34a3d14f63b4b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -24,7 +24,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.2.1 +Version: 4.2.2 Release: 1%{?dist} URL: http://sabre.io/vobject/ @@ -148,6 +148,9 @@ exit $ret %endif %changelog +* Tue Jan 14 2020 Remi Collet - 4.2.2-1 +- update to 4.2.2 + * Thu Dec 19 2019 Remi Collet - 4.2.1-1 - update to 4.2.1 - drop patch merged upstream diff --git a/sources b/sources index 4b66d6f..ea3d8f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.2.1-6d7476f.tar.gz) = c5b486912a2f7b6099217e18316845f254cb429d44c01211b59abff9f1cbc60febe1deba11638fe9116aa05e37d1ac31fb9f3d59f3cf5f2cf77fd892fe1ce0d5 +SHA512 (php-sabre-vobject4-4.2.2-449616b.tar.gz) = 46e9e798fed6d3bf5795fbf5c29bf6c20075529d572d951ed36b92e6e06c992f909b45291736a3206363239ee048d4a4c4bec539e1a37dbfa476b85e5c972e99 From dd95be0956976e1f39f7644567c3420d9b695651 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 08:41:16 +0000 Subject: [PATCH 20/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index c71d48e..eb2e271 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -25,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.2.2 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -148,6 +148,9 @@ exit $ret %endif %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 4.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Jan 14 2020 Remi Collet - 4.2.2-1 - update to 4.2.2 From 381f1c7512b2f6727afd6265014dee74294bc273 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 3 Feb 2020 08:26:02 +0100 Subject: [PATCH 21/55] update to 4.3.0 raise dependency on PHP 7.1 raise dependency on sabre/xml 2.1 switch to phpunit8 --- .gitignore | 1 + php-sabre-vobject4-autoload.php | 5 +---- php-sabre-vobject4-bin.patch | 20 +++++++++----------- php-sabre-vobject4.spec | 33 ++++++++++++++++++++------------- sources | 2 +- 5 files changed, 32 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index d08f6a4..1745276 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ clog /php-sabre-vobject4-4.2.0-bd50001.tar.gz /php-sabre-vobject4-4.2.1-6d7476f.tar.gz /php-sabre-vobject4-4.2.2-449616b.tar.gz +/php-sabre-vobject4-4.3.0-5b2248d.tar.gz diff --git a/php-sabre-vobject4-autoload.php b/php-sabre-vobject4-autoload.php index 71664f5..57829aa 100644 --- a/php-sabre-vobject4-autoload.php +++ b/php-sabre-vobject4-autoload.php @@ -5,9 +5,6 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Sabre\\VObject\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ - [ - '/usr/share/php/Sabre/Xml2/autoload.php', - '/usr/share/php/Sabre/Xml/autoload.php', - ], + '/usr/share/php/Sabre/Xml2/autoload.php', ]); diff --git a/php-sabre-vobject4-bin.patch b/php-sabre-vobject4-bin.patch index 96e112d..1a6b2ac 100644 --- a/php-sabre-vobject4-bin.patch +++ b/php-sabre-vobject4-bin.patch @@ -1,6 +1,6 @@ diff -up ./bin/generate_vcards.rpm ./bin/generate_vcards ---- ./bin/generate_vcards.rpm 2020-01-14 11:18:45.000000000 +0100 -+++ ./bin/generate_vcards 2020-01-14 14:13:58.718903396 +0100 +--- ./bin/generate_vcards.rpm 2020-01-31 19:50:58.000000000 +0100 ++++ ./bin/generate_vcards 2020-02-01 07:56:20.162307853 +0100 @@ -6,8 +6,7 @@ namespace Sabre\VObject; // This sucks.. we have to try to find the composer autoloader. But chances // are, we can't find it this way. So we'll do our bestest @@ -21,8 +21,8 @@ diff -up ./bin/generate_vcards.rpm ./bin/generate_vcards } diff -up ./bin/vobject.rpm ./bin/vobject ---- ./bin/vobject.rpm 2020-01-14 11:18:45.000000000 +0100 -+++ ./bin/vobject 2020-01-14 14:13:58.718903396 +0100 +--- ./bin/vobject.rpm 2020-01-31 19:50:58.000000000 +0100 ++++ ./bin/vobject 2020-02-01 07:56:20.162307853 +0100 @@ -6,8 +6,7 @@ namespace Sabre\VObject; // This sucks.. we have to try to find the composer autoloader. But chances // are, we can't find it this way. So we'll do our bestest @@ -43,8 +43,8 @@ diff -up ./bin/vobject.rpm ./bin/vobject } diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2020-01-14 11:18:45.000000000 +0100 -+++ ./tests/bootstrap.php 2020-01-14 14:15:34.557472825 +0100 +--- ./tests/bootstrap.php.rpm 2020-01-31 19:50:58.000000000 +0100 ++++ ./tests/bootstrap.php 2020-02-01 07:57:56.802761882 +0100 @@ -3,8 +3,7 @@ date_default_timezone_set('UTC'); @@ -55,12 +55,10 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ]; foreach ($try as $path) { -@@ -14,6 +13,8 @@ foreach ($try as $path) { +@@ -13,3 +12,6 @@ foreach ($try as $path) { + break; } } - ++ +\Fedora\Autoloader\Autoload::addPsr4('Sabre\\VObject\\', __DIR__ . '/VObject'); + - if (!defined('SABRE_TEMPDIR')) { - define('SABRE_TEMPDIR', __DIR__.'/temp/'); - } diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index eb2e271..01e7d66 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 449616b2d45b95c8973975de23f34a3d14f63b4b +%global gh_commit 5b2248d965160f93053f3a24704794a13a22a1bb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -24,8 +24,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.2.2 -Release: 2%{?dist} +Version: 4.3.0 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -37,29 +37,30 @@ Patch0: %{name}-bin.patch BuildArch: noarch %if %{with_tests} -BuildRequires: php(language) >= 5.5 +BuildRequires: php(language) >= 7.1 BuildRequires: php-mbstring -BuildRequires: (php-composer(sabre/xml) >= 1.5 with php-composer(sabre/xml) < 3) +BuildRequires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) BuildRequires: php-date BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" -# "phpunit/phpunit" : "> 4.8.35, <6.0.0" -BuildRequires: php-composer(phpunit/phpunit) > 4.8.35 +# "friendsofphp/php-cs-fixer": "~2.16.1", +# "phpunit/phpunit" : "^7 || ^8" +BuildRequires: phpunit8 # Autoloader BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require" -# "php" : ">=5.5", +# "php" : "^7.1", # "ext-mbstring" : "*", -# "sabre/xml" : ">=1.5 <3.0" -Requires: php(language) >= 5.5 +# "sabre/xml" : "^2.1" +Requires: php(language) >= 7.1 Requires: php-mbstring # -Requires: (php-composer(sabre/xml) >= 1.5 with php-composer(sabre/xml) < 3) +Requires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) # From phpcompatinfo report for version 4.1.2 %if %{with_cmd} Requires: php-cli @@ -125,9 +126,9 @@ fi : Run upstream test suite against installed library ret=0 -for cmd in php php71 php72 php73 php74; do +for cmd in php php72 php73 php74; do if which $cmd; then - $cmd %{_bindir}/phpunit $opt || ret=1 + $cmd %{_bindir}/phpunit8 $opt || ret=1 fi done exit $ret @@ -148,6 +149,12 @@ exit $ret %endif %changelog +* Sat Feb 1 2020 Remi Collet - 4.3.0-1 +- update to 4.3.0 +- raise dependency on PHP 7.1 +- raise dependency on sabre/xml 2.1 +- switch to phpunit8 + * Thu Jan 30 2020 Fedora Release Engineering - 4.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index ea3d8f9..709bf3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.2.2-449616b.tar.gz) = 46e9e798fed6d3bf5795fbf5c29bf6c20075529d572d951ed36b92e6e06c992f909b45291736a3206363239ee048d4a4c4bec539e1a37dbfa476b85e5c972e99 +SHA512 (php-sabre-vobject4-4.3.0-5b2248d.tar.gz) = d62e83d84eb01a7a53ca0ad8eb54604685827a7038ae0039eb44f792a31aa8992fe662fc84d76b37d2246b54c902624d84399a5d2a37b642ad8de4536c148c5e From 781966cd6ff57a158adaf37ad5bde23cae363e70 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 Jul 2020 14:11:20 +0200 Subject: [PATCH 22/55] v4.3.1 --- .gitignore | 1 + php-sabre-vobject4.spec | 20 ++++++++++++-------- sources | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 1745276..945f339 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ clog /php-sabre-vobject4-4.2.1-6d7476f.tar.gz /php-sabre-vobject4-4.2.2-449616b.tar.gz /php-sabre-vobject4-4.3.0-5b2248d.tar.gz +/php-sabre-vobject4-4.3.1-a7feca8.tar.gz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 01e7d66..a119b0c 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -10,11 +10,11 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 5b2248d965160f93053f3a24704794a13a22a1bb +%global gh_commit a7feca8311462e5da16952454e420b92c20d3586 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject -%global with_tests %{?_without_tests:0}%{!?_without_tests:1} +%bcond_without tests %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 %global with_cmd 1 @@ -24,7 +24,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.3.0 +Version: 4.3.1 Release: 1%{?dist} URL: http://sabre.io/vobject/ @@ -36,7 +36,7 @@ Source1: %{name}-autoload.php Patch0: %{name}-bin.patch BuildArch: noarch -%if %{with_tests} +%if %{with tests} BuildRequires: php(language) >= 7.1 BuildRequires: php-mbstring BuildRequires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) @@ -47,8 +47,9 @@ BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" # "friendsofphp/php-cs-fixer": "~2.16.1", -# "phpunit/phpunit" : "^7 || ^8" -BuildRequires: phpunit8 +# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", +# "phpstan/phpstan": "^0.12" +BuildRequires: phpunit8 >= 8.5 # Autoloader BuildRequires: php-composer(fedora/autoloader) %endif @@ -114,7 +115,7 @@ install -Dpm 0755 bin/generate_vcards \ %check -%if %{with_tests} +%if %{with tests} : Fix bootstrap cd tests sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php @@ -126,7 +127,7 @@ fi : Run upstream test suite against installed library ret=0 -for cmd in php php72 php73 php74; do +for cmd in php php72 php73 php74 php80; do if which $cmd; then $cmd %{_bindir}/phpunit8 $opt || ret=1 fi @@ -149,6 +150,9 @@ exit $ret %endif %changelog +* Mon Jul 13 2020 Remi Collet - 4.3.1-1 +- update to 4.3.1 + * Sat Feb 1 2020 Remi Collet - 4.3.0-1 - update to 4.3.0 - raise dependency on PHP 7.1 diff --git a/sources b/sources index 709bf3a..a4c489b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.3.0-5b2248d.tar.gz) = d62e83d84eb01a7a53ca0ad8eb54604685827a7038ae0039eb44f792a31aa8992fe662fc84d76b37d2246b54c902624d84399a5d2a37b642ad8de4536c148c5e +SHA512 (php-sabre-vobject4-4.3.1-a7feca8.tar.gz) = 192d1d676a982a8c4193396860aa25dc97908d89866f12ae66c4f2943a59b39dfd1b0c77d375accd89e28e995237191bf0a830915af77563ee5844c7c96d960c From 436118115f4b8aa0b9680f77513da8ef436c874a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 22:10:22 +0000 Subject: [PATCH 23/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index a119b0c..2f47416 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -25,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.3.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -150,6 +150,9 @@ exit $ret %endif %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 4.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 13 2020 Remi Collet - 4.3.1-1 - update to 4.3.1 From b3521093ebb738d30caa0b048eebb70e26151562 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Oct 2020 10:23:38 +0200 Subject: [PATCH 24/55] v4.3.2 --- .gitignore | 1 + php-sabre-vobject4.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 945f339..17d4534 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ clog /php-sabre-vobject4-4.2.2-449616b.tar.gz /php-sabre-vobject4-4.3.0-5b2248d.tar.gz /php-sabre-vobject4-4.3.1-a7feca8.tar.gz +/php-sabre-vobject4-4.3.2-e17daaf.tar.gz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 2f47416..28b0c9c 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -7,14 +7,15 @@ # Please, preserve the changelog entries # +%bcond_without tests + # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit a7feca8311462e5da16952454e420b92c20d3586 +%global gh_commit e17daaf92a12d39e93ab404929673573e3bb85bf %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject -%bcond_without tests %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 %global with_cmd 1 @@ -24,8 +25,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.3.1 -Release: 2%{?dist} +Version: 4.3.2 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -55,7 +56,7 @@ BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require" -# "php" : "^7.1", +# "php" : "^7.1 || ^8.0", # "ext-mbstring" : "*", # "sabre/xml" : "^2.1" Requires: php(language) >= 7.1 @@ -150,6 +151,9 @@ exit $ret %endif %changelog +* Mon Oct 5 2020 Remi Collet - 4.3.2-1 +- update to 4.3.2 + * Tue Jul 28 2020 Fedora Release Engineering - 4.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index a4c489b..f8d93e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.3.1-a7feca8.tar.gz) = 192d1d676a982a8c4193396860aa25dc97908d89866f12ae66c4f2943a59b39dfd1b0c77d375accd89e28e995237191bf0a830915af77563ee5844c7c96d960c +SHA512 (php-sabre-vobject4-4.3.2-e17daaf.tar.gz) = 0461bd016f58fea8e0e35065378501c6908b228d600a9b8836dbb396cdc4bcbba12d463d71e0f4656f3b6dc240216ba336f9edc757257958e991d9f8a5a8e178 From b4c3d76a9d5b0e63faac60d2f3120ba16b0e7274 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 9 Nov 2020 08:33:42 +0100 Subject: [PATCH 25/55] v4.3.3 --- .gitignore | 1 + php-sabre-vobject4.spec | 24 +++++++++++++++++------- sources | 2 +- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 17d4534..7324ee1 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ clog /php-sabre-vobject4-4.3.0-5b2248d.tar.gz /php-sabre-vobject4-4.3.1-a7feca8.tar.gz /php-sabre-vobject4-4.3.2-e17daaf.tar.gz +/php-sabre-vobject4-4.3.3-58f9f9b.tar.gz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 28b0c9c..6b6c906 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit e17daaf92a12d39e93ab404929673573e3bb85bf +%global gh_commit 58f9f9b46a1080c0130bd86f4df9a568aacb9c79 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -25,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.3.2 +Version: 4.3.3 Release: 1%{?dist} URL: http://sabre.io/vobject/ @@ -47,10 +47,16 @@ BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" -# "friendsofphp/php-cs-fixer": "~2.16.1", +# "friendsofphp/php-cs-fixer": "~2.16.7", # "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", # "phpstan/phpstan": "^0.12" -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 # Autoloader BuildRequires: php-composer(fedora/autoloader) %endif @@ -128,9 +134,10 @@ fi : 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 $opt || ret=1 +for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 fi done exit $ret @@ -151,6 +158,9 @@ exit $ret %endif %changelog +* Mon Nov 9 2020 Remi Collet - 4.3.3-1 +- update to 4.3.3 + * Mon Oct 5 2020 Remi Collet - 4.3.2-1 - update to 4.3.2 diff --git a/sources b/sources index f8d93e7..eb4abd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.3.2-e17daaf.tar.gz) = 0461bd016f58fea8e0e35065378501c6908b228d600a9b8836dbb396cdc4bcbba12d463d71e0f4656f3b6dc240216ba336f9edc757257958e991d9f8a5a8e178 +SHA512 (php-sabre-vobject4-4.3.3-58f9f9b.tar.gz) = 9b77d6a6e0b4c9cdf38cb6f48ab0ccdde3e08cdd221fd64c14dbbc9df85ae20f6140f2183ad871b29fbd86bbf57c44047fc9d2180b42b68733def4be9861bfea From 3232bb02021b472a0824111beeede6eede15efb2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 07:46:46 +0000 Subject: [PATCH 26/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 6b6c906..f8b8cd9 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -26,7 +26,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.3.3 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -158,6 +158,9 @@ exit $ret %endif %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 4.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Nov 9 2020 Remi Collet - 4.3.3-1 - update to 4.3.3 From effbc4b28f630bdcaf18db42c3783cd9aebae5c8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 Feb 2021 11:47:37 +0100 Subject: [PATCH 27/55] update to 4.3.4 sources from git snapshot --- .gitignore | 1 + makesrc.sh | 32 ++++++++++++++++++++++++++++++++ php-sabre-vobject4.spec | 18 ++++++++++++------ sources | 2 +- 4 files changed, 46 insertions(+), 7 deletions(-) create mode 100755 makesrc.sh diff --git a/.gitignore b/.gitignore index 7324ee1..65f3209 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ clog /php-sabre-vobject4-4.3.1-a7feca8.tar.gz /php-sabre-vobject4-4.3.2-e17daaf.tar.gz /php-sabre-vobject4-4.3.3-58f9f9b.tar.gz +/php-sabre-vobject4-4.3.4-3168acd.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-vobject4.spec b/php-sabre-vobject4.spec index f8b8cd9..d6ad63b 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-sabre-vobject4 # -# Copyright (c) 2013-2019 Remi Collet +# Copyright (c) 2013-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 58f9f9b46a1080c0130bd86f4df9a568aacb9c79 +%global gh_commit 3168acd7c22fa3c96cb115539f93b59818ba1f06 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -25,13 +25,14 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.3.3 -Release: 2%{?dist} +Version: 4.3.4 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz +Source0: %{name}-%{version}-%{gh_short}.tgz Source1: %{name}-autoload.php +Source2: makesrc.sh # replace composer autloader Patch0: %{name}-bin.patch @@ -47,8 +48,9 @@ BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" -# "friendsofphp/php-cs-fixer": "~2.16.7", +# "friendsofphp/php-cs-fixer": "~2.17.1", # "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", +# "phpunit/php-invoker" : "^2.0 || ^3.1", # "phpstan/phpstan": "^0.12" %if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 BuildRequires: phpunit9 @@ -158,6 +160,10 @@ exit $ret %endif %changelog +* Thu Feb 4 2021 Remi Collet - 4.3.4-1 +- update to 4.3.4 +- sources from git snapshot + * Wed Jan 27 2021 Fedora Release Engineering - 4.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index eb4abd4..e8491f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.3.3-58f9f9b.tar.gz) = 9b77d6a6e0b4c9cdf38cb6f48ab0ccdde3e08cdd221fd64c14dbbc9df85ae20f6140f2183ad871b29fbd86bbf57c44047fc9d2180b42b68733def4be9861bfea +SHA512 (php-sabre-vobject4-4.3.4-3168acd.tgz) = cf1c84b1e4e68bedc91a18f07ea0408c94c6008e331598ca7d390bd253e8c33ecc74f4b2ae9f87f9e925f42b2cb953d4229508388472ef7efc447598521d8884 From 77254397a408920cd3cf231c1be681b640135ddb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 15 Feb 2021 12:07:33 +0100 Subject: [PATCH 28/55] v4.3.5 --- .gitignore | 1 + php-sabre-vobject4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 65f3209..c4af56e 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /php-sabre-vobject4-4.3.2-e17daaf.tar.gz /php-sabre-vobject4-4.3.3-58f9f9b.tar.gz /php-sabre-vobject4-4.3.4-3168acd.tgz +/php-sabre-vobject4-4.3.5-d8a0a9a.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index d6ad63b..126efba 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 3168acd7c22fa3c96cb115539f93b59818ba1f06 +%global gh_commit d8a0a9ae215a8acfb51afc29101c7344670b9c83 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -25,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.3.4 +Version: 4.3.5 Release: 1%{?dist} URL: http://sabre.io/vobject/ @@ -160,6 +160,9 @@ exit $ret %endif %changelog +* Mon Feb 15 2021 Remi Collet - 4.3.5-1 +- update to 4.3.5 + * Thu Feb 4 2021 Remi Collet - 4.3.4-1 - update to 4.3.4 - sources from git snapshot diff --git a/sources b/sources index e8491f1..d1b49e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.3.4-3168acd.tgz) = cf1c84b1e4e68bedc91a18f07ea0408c94c6008e331598ca7d390bd253e8c33ecc74f4b2ae9f87f9e925f42b2cb953d4229508388472ef7efc447598521d8884 +SHA512 (php-sabre-vobject4-4.3.5-d8a0a9a.tgz) = 6380fe2e349a0d875847168500e45e5ca42b8e232af78d1b486650fd6e6382a643e51687cc4ae8f99e6dd21c202c70d9c330424608a860d816db289242f6e5ec From f6b0db95abcbd54eabe4f29fb00344ac2c08fe9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 03:12:30 +0000 Subject: [PATCH 29/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 126efba..31973f7 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -26,7 +26,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.3.5 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -160,6 +160,9 @@ exit $ret %endif %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Feb 15 2021 Remi Collet - 4.3.5-1 - update to 4.3.5 From 146b583d375e418a56593c2f5bc6b1e8a90663fd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Jul 2021 08:57:22 +0200 Subject: [PATCH 30/55] ignore 1 more test failing on 32-bit --- php-sabre-vobject4.spec | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 31973f7..8c25258 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -26,7 +26,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.3.5 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -52,13 +52,8 @@ BuildRequires: php-xml # "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", # "phpunit/php-invoker" : "^2.0 || ^3.1", # "phpstan/phpstan": "^0.12" -%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 BuildRequires: phpunit9 %global phpunit %{_bindir}/phpunit9 -%else -BuildRequires: phpunit8 -%global phpunit %{_bindir}/phpunit8 -%endif # Autoloader BuildRequires: php-composer(fedora/autoloader) %endif @@ -131,12 +126,12 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php opt="--verbose" if [ $(php -r 'echo PHP_INT_SIZE;') -lt 8 ]; then - opt="--filter '^((?!(testNeverEnding)).)*$' $opt" + opt="--filter '^((?!(testNeverEnding|testGeneratorBaseObject)).)*$' $opt" fi : 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}" php73 php74 php80; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -160,6 +155,9 @@ exit $ret %endif %changelog +* Mon Jul 26 2021 Remi Collet - 4.3.5-3 +- ignore 1 more test failing on 32-bit + * Fri Jul 23 2021 Fedora Release Engineering - 4.3.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 134ec383ce569a94f0d90152989eb000ca75914b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 Nov 2021 09:01:05 +0100 Subject: [PATCH 31/55] v4.3.7 --- .gitignore | 1 + php-sabre-vobject4.spec | 21 ++++++++++++++++----- sources | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c4af56e..c3c8874 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ clog /php-sabre-vobject4-4.3.3-58f9f9b.tar.gz /php-sabre-vobject4-4.3.4-3168acd.tgz /php-sabre-vobject4-4.3.5-d8a0a9a.tgz +/php-sabre-vobject4-4.3.7-c3fa8c8.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 8c25258..1e4d416 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit d8a0a9ae215a8acfb51afc29101c7344670b9c83 +%global gh_commit c3fa8c8fec2fe4de91ae0c537748c22ecb0b6062 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -25,8 +25,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.3.5 -Release: 3%{?dist} +Version: 4.3.7 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -119,11 +119,19 @@ install -Dpm 0755 bin/generate_vcards \ %check -%if %{with tests} : Fix bootstrap cd tests sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php +: Check version +php -r ' +require "%{_datadir}/php/Fedora/Autoloader/autoload.php"; +require "bootstrap.php"; +echo Sabre\VObject\Version::VERSION . "\n"; +exit (Sabre\VObject\Version::VERSION === "%{version}" ? 0 : 1); +' + +%if %{with tests} opt="--verbose" if [ $(php -r 'echo PHP_INT_SIZE;') -lt 8 ]; then opt="--filter '^((?!(testNeverEnding|testGeneratorBaseObject)).)*$' $opt" @@ -131,7 +139,7 @@ fi : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php73 php74 php80; do +for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -155,6 +163,9 @@ exit $ret %endif %changelog +* Thu Nov 4 2021 Remi Collet - 4.3.7-1 +- update to 4.3.7 + * Mon Jul 26 2021 Remi Collet - 4.3.5-3 - ignore 1 more test failing on 32-bit diff --git a/sources b/sources index d1b49e2..ad0ec8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.3.5-d8a0a9a.tgz) = 6380fe2e349a0d875847168500e45e5ca42b8e232af78d1b486650fd6e6382a643e51687cc4ae8f99e6dd21c202c70d9c330424608a860d816db289242f6e5ec +SHA512 (php-sabre-vobject4-4.3.7-c3fa8c8.tgz) = 2b861cac9eca4674bd84df0b4e945cf8303dec2b3cab91bfe8d8b6794168313ef0cf47e4f348776237fc0fd29d8c3e646a3688d278fb103f20d822b77d527999 From 4a158dafa377c36e67ad2bfd752624967771097d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 15 Nov 2021 14:00:21 +0100 Subject: [PATCH 32/55] v4.3.8 --- .gitignore | 1 + php-sabre-vobject4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c3c8874..9f201a7 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ clog /php-sabre-vobject4-4.3.4-3168acd.tgz /php-sabre-vobject4-4.3.5-d8a0a9a.tgz /php-sabre-vobject4-4.3.7-c3fa8c8.tgz +/php-sabre-vobject4-4.3.8-a7460c5.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 1e4d416..6870b01 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit c3fa8c8fec2fe4de91ae0c537748c22ecb0b6062 +%global gh_commit a7460c537056f5969c7d700607f20f497e3175c2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -25,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.3.7 +Version: 4.3.8 Release: 1%{?dist} URL: http://sabre.io/vobject/ @@ -163,6 +163,9 @@ exit $ret %endif %changelog +* Mon Nov 15 2021 Remi Collet - 4.3.8-1 +- update to 4.3.8 + * Thu Nov 4 2021 Remi Collet - 4.3.7-1 - update to 4.3.7 diff --git a/sources b/sources index ad0ec8e..82357ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.3.7-c3fa8c8.tgz) = 2b861cac9eca4674bd84df0b4e945cf8303dec2b3cab91bfe8d8b6794168313ef0cf47e4f348776237fc0fd29d8c3e646a3688d278fb103f20d822b77d527999 +SHA512 (php-sabre-vobject4-4.3.8-a7460c5.tgz) = 3058e39b87d3062da5b6e10f06eb0b978fbd50b3abd4237f589233791de1616961334b705a14121a306bfc4c57420fe8459df39fb6246dc6a89d257a3d48b982 From 746fe6432d6dd9e2e08c800f4d1e70d4bc6289ac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 Nov 2021 11:38:00 +0100 Subject: [PATCH 33/55] v4.4.0 --- .gitignore | 1 + php-sabre-vobject4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9f201a7..00335d5 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ clog /php-sabre-vobject4-4.3.5-d8a0a9a.tgz /php-sabre-vobject4-4.3.7-c3fa8c8.tgz /php-sabre-vobject4-4.3.8-a7460c5.tgz +/php-sabre-vobject4-4.4.0-0a2e27c.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 6870b01..4080b85 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit a7460c537056f5969c7d700607f20f497e3175c2 +%global gh_commit 0a2e27c797ec0934f376764e1a16567bbbcece0b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -25,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.3.8 +Version: 4.4.0 Release: 1%{?dist} URL: http://sabre.io/vobject/ @@ -163,6 +163,9 @@ exit $ret %endif %changelog +* Tue Nov 16 2021 Remi Collet - 4.4.0-1 +- update to 4.4.0 + * Mon Nov 15 2021 Remi Collet - 4.3.8-1 - update to 4.3.8 diff --git a/sources b/sources index 82357ca..9eae753 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.3.8-a7460c5.tgz) = 3058e39b87d3062da5b6e10f06eb0b978fbd50b3abd4237f589233791de1616961334b705a14121a306bfc4c57420fe8459df39fb6246dc6a89d257a3d48b982 +SHA512 (php-sabre-vobject4-4.4.0-0a2e27c.tgz) = 21f020725caa41d0a676e47e76b02334ed9309b6f57637f3042cef56bc3d5752046435676a9fdce8044837e59d6b7533cbe6be74ea82667f0f0562791265175c From ea8e7aec59ac2121174f651c8ddf03e73ab6f645 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 7 Dec 2021 12:20:25 +0100 Subject: [PATCH 34/55] v4.4.1 --- .gitignore | 1 + php-sabre-vobject4.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 00335d5..c3019e8 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ clog /php-sabre-vobject4-4.3.7-c3fa8c8.tgz /php-sabre-vobject4-4.3.8-a7460c5.tgz /php-sabre-vobject4-4.4.0-0a2e27c.tgz +/php-sabre-vobject4-4.4.1-06feff3.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 4080b85..cce4e23 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 0a2e27c797ec0934f376764e1a16567bbbcece0b +%global gh_commit 06feff370141fd3118609f808e86d9315864bf14 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -25,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.4.0 +Version: 4.4.1 Release: 1%{?dist} URL: http://sabre.io/vobject/ @@ -139,7 +139,7 @@ fi : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do +for cmdarg in "php %{phpunit}" php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -152,7 +152,6 @@ exit $ret %files -%{!?_licensedir:%global license %%doc} %license LICENSE %doc *md %doc composer.json @@ -163,6 +162,9 @@ exit $ret %endif %changelog +* Tue Dec 7 2021 Remi Collet - 4.4.1-1 +- update to 4.4.1 + * Tue Nov 16 2021 Remi Collet - 4.4.0-1 - update to 4.4.0 diff --git a/sources b/sources index 9eae753..add729e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.4.0-0a2e27c.tgz) = 21f020725caa41d0a676e47e76b02334ed9309b6f57637f3042cef56bc3d5752046435676a9fdce8044837e59d6b7533cbe6be74ea82667f0f0562791265175c +SHA512 (php-sabre-vobject4-4.4.1-06feff3.tgz) = ffb390b0bedfc8dfdeb044f26a49da2ccb07b9ea552fdb0f5feb32a09f8e0bef2c1c54b627f1d68148a4f0a01b82c77f4abe4891b58846240fc26d137cdb09a9 From 98e60dbf80f790ff625ba8b7a4936318fc58b61f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 08:31:53 +0000 Subject: [PATCH 35/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index cce4e23..f61566c 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -26,7 +26,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.4.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -162,6 +162,9 @@ exit $ret %endif %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 4.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Dec 7 2021 Remi Collet - 4.4.1-1 - update to 4.4.1 From 9b772dd5b265aa4629e45bac200d2b103ff05cc0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 24 Jun 2022 14:40:41 +0200 Subject: [PATCH 36/55] v4.4.2 --- .gitignore | 1 + php-sabre-vobject4.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c3019e8..139162f 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ clog /php-sabre-vobject4-4.3.8-a7460c5.tgz /php-sabre-vobject4-4.4.0-0a2e27c.tgz /php-sabre-vobject4-4.4.1-06feff3.tgz +/php-sabre-vobject4-4.4.2-b8a44ea.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index f61566c..79b3b81 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-sabre-vobject4 # -# Copyright (c) 2013-2021 Remi Collet +# Copyright (c) 2013-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 06feff370141fd3118609f808e86d9315864bf14 +%global gh_commit b8a44ea1610d9b7012e42a7ff6f1cb66f0b757dd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -25,8 +25,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.4.1 -Release: 2%{?dist} +Version: 4.4.2 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -162,6 +162,9 @@ exit $ret %endif %changelog +* Fri Jun 24 2022 Remi Collet - 4.4.2-1 +- update to 4.4.2 + * Fri Jan 21 2022 Fedora Release Engineering - 4.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index add729e..b66ef05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.4.1-06feff3.tgz) = ffb390b0bedfc8dfdeb044f26a49da2ccb07b9ea552fdb0f5feb32a09f8e0bef2c1c54b627f1d68148a4f0a01b82c77f4abe4891b58846240fc26d137cdb09a9 +SHA512 (php-sabre-vobject4-4.4.2-b8a44ea.tgz) = db79bb6192c90d00c50906401f88fde6afb1c44f30373982faa54a00e397581783098c3313fee021927a3e4559423d5032644a95361bfb3e996a9031efc237a2 From 924bb4887269fea1591acdb340903d315c812be2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 18 Jul 2022 08:52:32 +0200 Subject: [PATCH 37/55] v4.4.3 --- .gitignore | 1 + php-sabre-vobject4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 139162f..cc49494 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ clog /php-sabre-vobject4-4.4.0-0a2e27c.tgz /php-sabre-vobject4-4.4.1-06feff3.tgz /php-sabre-vobject4-4.4.2-b8a44ea.tgz +/php-sabre-vobject4-4.4.3-2a043b9.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 79b3b81..174d217 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit b8a44ea1610d9b7012e42a7ff6f1cb66f0b757dd +%global gh_commit 2a043b994fa8d8a655c3d50d73c1ad443d31d677 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -25,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.4.2 +Version: 4.4.3 Release: 1%{?dist} URL: http://sabre.io/vobject/ @@ -162,6 +162,9 @@ exit $ret %endif %changelog +* Mon Jul 18 2022 Remi Collet - 4.4.3-1 +- update to 4.4.3 + * Fri Jun 24 2022 Remi Collet - 4.4.2-1 - update to 4.4.2 diff --git a/sources b/sources index b66ef05..0f8e6c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.4.2-b8a44ea.tgz) = db79bb6192c90d00c50906401f88fde6afb1c44f30373982faa54a00e397581783098c3313fee021927a3e4559423d5032644a95361bfb3e996a9031efc237a2 +SHA512 (php-sabre-vobject4-4.4.3-2a043b9.tgz) = d1025942a19ed54ca211334878eb4473182bafe166ba560403705db2ac2092a4d138b99a6005e3db86a15cda5eca71812b671977f327add7c2fcf6f997588896 From 9da3dfdcd7b1d536530ec18c5a07d3c8d7b4fda1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 14:25:36 +0000 Subject: [PATCH 38/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 174d217..20ced88 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -26,7 +26,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.4.3 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -162,6 +162,9 @@ exit $ret %endif %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 4.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jul 18 2022 Remi Collet - 4.4.3-1 - update to 4.4.3 From 27f89de63590c797348633ac7fbc9138580dff85 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 18 Aug 2022 07:46:35 +0200 Subject: [PATCH 39/55] v4.5.0 --- .gitignore | 1 + php-sabre-vobject4.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index cc49494..481d64c 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ clog /php-sabre-vobject4-4.4.1-06feff3.tgz /php-sabre-vobject4-4.4.2-b8a44ea.tgz /php-sabre-vobject4-4.4.3-2a043b9.tgz +/php-sabre-vobject4-4.5.0-d1fdc0c.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 20ced88..033cfce 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 2a043b994fa8d8a655c3d50d73c1ad443d31d677 +%global gh_commit d1fdc0c3587a314bdd3aac4a1e1dcacadd91858e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -25,8 +25,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.4.3 -Release: 2%{?dist} +Version: 4.5.0 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -139,7 +139,7 @@ fi : 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 $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -162,6 +162,9 @@ exit $ret %endif %changelog +* Thu Aug 18 2022 Remi Collet - 4.5.0-1 +- update to 4.5.0 + * Fri Jul 22 2022 Fedora Release Engineering - 4.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 0f8e6c2..a10e368 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.4.3-2a043b9.tgz) = d1025942a19ed54ca211334878eb4473182bafe166ba560403705db2ac2092a4d138b99a6005e3db86a15cda5eca71812b671977f327add7c2fcf6f997588896 +SHA512 (php-sabre-vobject4-4.5.0-d1fdc0c.tgz) = d81f383a95fad24ad3efe2be2e5c34939f2f890db63d78a3790526f686b1bf63e40364ddea53620a7f24ef4d05cbdc1a69f7f7caaf723d734d5cae6a4ec365ca From c0108d4c312c7154e611422ae1a596510010fd6a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 18 Aug 2022 07:53:31 +0200 Subject: [PATCH 40/55] skip 2 more tests on 32-bit --- php-sabre-vobject4.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 033cfce..65f5d76 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -134,7 +134,7 @@ exit (Sabre\VObject\Version::VERSION === "%{version}" ? 0 : 1); %if %{with tests} opt="--verbose" if [ $(php -r 'echo PHP_INT_SIZE;') -lt 8 ]; then - opt="--filter '^((?!(testNeverEnding|testGeneratorBaseObject)).)*$' $opt" + opt="--filter '^((?!(testNeverEnding|testGeneratorBaseObject|testDailyBySetPosLoop|testYearlyBySetPosLoop)).)*$' $opt" fi : Run upstream test suite against installed library From 9c39d172252ee01d8d05d13e66dfb7e643597ef6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Oct 2022 14:29:45 +0200 Subject: [PATCH 41/55] v4.5.1 --- .gitignore | 1 + php-sabre-vobject4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 481d64c..74b034d 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ clog /php-sabre-vobject4-4.4.2-b8a44ea.tgz /php-sabre-vobject4-4.4.3-2a043b9.tgz /php-sabre-vobject4-4.5.0-d1fdc0c.tgz +/php-sabre-vobject4-4.5.1-1f83674.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 65f5d76..2e0c0e2 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit d1fdc0c3587a314bdd3aac4a1e1dcacadd91858e +%global gh_commit 1f836740c88bac483f3b572a332eb8fd1cd04981 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -25,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.5.0 +Version: 4.5.1 Release: 1%{?dist} URL: http://sabre.io/vobject/ @@ -162,6 +162,9 @@ exit $ret %endif %changelog +* Mon Oct 10 2022 Remi Collet - 4.5.1-1 +- update to 4.5.1 + * Thu Aug 18 2022 Remi Collet - 4.5.0-1 - update to 4.5.0 diff --git a/sources b/sources index a10e368..b512811 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.0-d1fdc0c.tgz) = d81f383a95fad24ad3efe2be2e5c34939f2f890db63d78a3790526f686b1bf63e40364ddea53620a7f24ef4d05cbdc1a69f7f7caaf723d734d5cae6a4ec365ca +SHA512 (php-sabre-vobject4-4.5.1-1f83674.tgz) = 2d6df21a8ef43b155f139105b662cb4ae84374110aa4187324fd775b5d71cd05fc467efe1a95dadd07b755585cf2c1bd63095a22e8747548c021be7dad1adcd2 From 8dd9f157af589c7d3f0a9a7cb31e15c928ee66ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 09:20:16 +0000 Subject: [PATCH 42/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 2e0c0e2..38fcd1d 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -26,7 +26,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.5.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -162,6 +162,9 @@ exit $ret %endif %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 4.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Oct 10 2022 Remi Collet - 4.5.1-1 - update to 4.5.1 From 962d2013d381ed6e726dac6ef48d95ab9a40ff44 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 25 Jan 2023 10:52:50 +0100 Subject: [PATCH 43/55] update to 4.5.3 low dependency on PHP 7.1 low dependency on sabre/xml v2 --- .gitignore | 1 + php-sabre-vobject4-autoload.php | 10 ------- php-sabre-vobject4.spec | 46 ++++++++++++++++++++++----------- sources | 2 +- 4 files changed, 33 insertions(+), 26 deletions(-) delete mode 100644 php-sabre-vobject4-autoload.php diff --git a/.gitignore b/.gitignore index 74b034d..79dcf62 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ clog /php-sabre-vobject4-4.4.3-2a043b9.tgz /php-sabre-vobject4-4.5.0-d1fdc0c.tgz /php-sabre-vobject4-4.5.1-1f83674.tgz +/php-sabre-vobject4-4.5.3-fe6d918.tgz diff --git a/php-sabre-vobject4-autoload.php b/php-sabre-vobject4-autoload.php deleted file mode 100644 index 57829aa..0000000 --- a/php-sabre-vobject4-autoload.php +++ /dev/null @@ -1,10 +0,0 @@ -= 7.1 BuildRequires: php-mbstring -BuildRequires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) +BuildRequires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 5) BuildRequires: php-date BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" -# "friendsofphp/php-cs-fixer": "~2.17.1", +# "friendsofphp/php-cs-fixer": "^2.17.1", # "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", # "phpunit/php-invoker" : "^2.0 || ^3.1", # "phpstan/phpstan": "^0.12" BuildRequires: phpunit9 %global phpunit %{_bindir}/phpunit9 -# Autoloader -BuildRequires: php-composer(fedora/autoloader) %endif +# Autoloader +BuildRequires: php-fedora-autoloader-devel # From composer.json, "require" # "php" : "^7.1 || ^8.0", # "ext-mbstring" : "*", -# "sabre/xml" : "^2.1" +# "sabre/xml" : "^2.1 || ^3.0 || ^4.0" Requires: php(language) >= 7.1 Requires: php-mbstring # -Requires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) +Requires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 5) # From phpcompatinfo report for version 4.1.2 %if %{with_cmd} Requires: php-cli @@ -97,7 +96,19 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php %patch0 -p1 -b .rpm -cp %{SOURCE1} lib/autoload.php +phpab -t fedora -o lib/autoload.php lib + +cat << 'EOF' | tee -a lib/autoload.php + +// Dependencies +\Fedora\Autoloader\Dependencies::required([ + [ + '%{_datadir}/php/Sabre/Xml4/autoload.php', + '%{_datadir}/php/Sabre/Xml3/autoload.php', + '%{_datadir}/php/Sabre/Xml2/autoload.php', + ], +]); +EOF %build @@ -139,7 +150,7 @@ fi : 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; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -162,6 +173,11 @@ exit $ret %endif %changelog +* Wed Jan 25 2023 Remi Collet - 4.5.3-1 +- update to 4.5.3 +- low dependency on PHP 7.1 +- low dependency on sabre/xml v2 + * Fri Jan 20 2023 Fedora Release Engineering - 4.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index b512811..aa51a9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.1-1f83674.tgz) = 2d6df21a8ef43b155f139105b662cb4ae84374110aa4187324fd775b5d71cd05fc467efe1a95dadd07b755585cf2c1bd63095a22e8747548c021be7dad1adcd2 +SHA512 (php-sabre-vobject4-4.5.3-fe6d918.tgz) = 4aab893c740ae1a0b770ded667f95b06d02bf172bb4cfb82bb18e7dd604620e8009d3fe9c4b555fa228b72f002bfedf3a82dd9533c4093cef8b94e8ab2713c7a From 01fad9df0c06ecb229a0a3eeb88db04f1c22438b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 25 Jan 2023 10:56:04 +0100 Subject: [PATCH 44/55] fix changelog --- php-sabre-vobject4.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 58d3ab6..621455f 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -175,8 +175,8 @@ exit $ret %changelog * Wed Jan 25 2023 Remi Collet - 4.5.3-1 - update to 4.5.3 -- low dependency on PHP 7.1 -- low dependency on sabre/xml v2 +- allow sabre/xml v3 or v4 +- switch to classmap autoloader * Fri Jan 20 2023 Fedora Release Engineering - 4.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 02298d814b5b160cbd905d636b7b0dd371c8426c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 05:08:30 +0000 Subject: [PATCH 45/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 621455f..ef7ce3d 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -26,7 +26,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.5.3 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -173,6 +173,9 @@ exit $ret %endif %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 4.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 25 2023 Remi Collet - 4.5.3-1 - update to 4.5.3 - allow sabre/xml v3 or v4 From 04447806313f086b6bd7d08dd7448adc034f0485 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Nov 2023 15:36:07 +0100 Subject: [PATCH 46/55] v4.5.4 --- .gitignore | 1 + php-sabre-vobject4.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 79dcf62..17ca1e1 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ clog /php-sabre-vobject4-4.5.0-d1fdc0c.tgz /php-sabre-vobject4-4.5.1-1f83674.tgz /php-sabre-vobject4-4.5.3-fe6d918.tgz +/php-sabre-vobject4-4.5.4-a6d53a3.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index ef7ce3d..0449197 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit fe6d9183154ed6f2f913f2b568d3d51d8ae9b308 +%global gh_commit a6d53a3e5bec85ed3dd78868b7de0f5b4e12f772 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -25,8 +25,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.5.3 -Release: 2%{?dist} +Version: 4.5.4 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -94,7 +94,7 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -b .rpm +%patch -P0 -p1 -b .rpm phpab -t fedora -o lib/autoload.php lib @@ -150,7 +150,7 @@ fi : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php80 php81 php82; do +for cmdarg in "php %{phpunit}" php80 php81 php82 php83; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -173,6 +173,9 @@ exit $ret %endif %changelog +* Thu Nov 9 2023 Remi Collet - 4.5.4-1 +- update to 4.5.4 + * Fri Jul 21 2023 Fedora Release Engineering - 4.5.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index aa51a9c..5533a97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.3-fe6d918.tgz) = 4aab893c740ae1a0b770ded667f95b06d02bf172bb4cfb82bb18e7dd604620e8009d3fe9c4b555fa228b72f002bfedf3a82dd9533c4093cef8b94e8ab2713c7a +SHA512 (php-sabre-vobject4-4.5.4-a6d53a3.tgz) = f391d81868c842942ba0902345ea57a5767b769b6976683d884b15c1affe539ef60ca9a7c598a0a6be85a7386c12bfb83f1ad55a06788ddb3812aef24edff7ad From 8f6123cf0b3a32eb2b5d44e1e03988718ec5e961 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:23:39 +0000 Subject: [PATCH 47/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 0449197..1c2a492 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -26,7 +26,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.5.4 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -173,6 +173,9 @@ exit $ret %endif %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 4.5.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Nov 9 2023 Remi Collet - 4.5.4-1 - update to 4.5.4 From f2171dd000f8c63c4523a40ef9269ab0ebb75230 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 23:11:23 +0000 Subject: [PATCH 48/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 1c2a492..f3b7f24 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -26,7 +26,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.5.4 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -173,6 +173,9 @@ exit $ret %endif %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 4.5.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 4.5.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 39f7ebf1d29ea5b1c2aa3c190ff37ee3f6c65362 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 3 Jul 2024 06:51:03 +0200 Subject: [PATCH 49/55] v4.5.5 --- .gitignore | 1 + php-sabre-vobject4.spec | 20 +++++++++----------- sources | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 17ca1e1..f33e41c 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ clog /php-sabre-vobject4-4.5.1-1f83674.tgz /php-sabre-vobject4-4.5.3-fe6d918.tgz /php-sabre-vobject4-4.5.4-a6d53a3.tgz +/php-sabre-vobject4-4.5.5-7148cf5.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index f3b7f24..6b8e2fd 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-sabre-vobject4 # -# Copyright (c) 2013-2023 Remi Collet +# Copyright (c) 2013-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -12,21 +12,16 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit a6d53a3e5bec85ed3dd78868b7de0f5b4e12f772 +%global gh_commit 7148cf57d25aaba0a49f6656d37c35e8175b3087 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject - -%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 -%global with_cmd 1 -%else -%global with_cmd 0 -%endif +%global with_cmd 1 Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.5.4 -Release: 3%{?dist} +Version: 4.5.5 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -150,7 +145,7 @@ fi : 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; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -173,6 +168,9 @@ exit $ret %endif %changelog +* Wed Jul 3 2024 Remi Collet - 4.5.5-1 +- update to 4.5.5 + * Thu Jan 25 2024 Fedora Release Engineering - 4.5.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 5533a97..033c186 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.4-a6d53a3.tgz) = f391d81868c842942ba0902345ea57a5767b769b6976683d884b15c1affe539ef60ca9a7c598a0a6be85a7386c12bfb83f1ad55a06788ddb3812aef24edff7ad +SHA512 (php-sabre-vobject4-4.5.5-7148cf5.tgz) = 6de05e4e85c5e44564b7b9f4d62a86cf478845a9f68be3a1d7373ebedaac7cf4df0995b2d373b5cde5a429fce708def7578fc209e44cc5a19c99812746c54609 From f9c9a18bc56c8574ac67c9600b4574d0d5c2a4c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:25:28 +0000 Subject: [PATCH 50/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 6b8e2fd..bdf3fbb 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -21,7 +21,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.5.5 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -168,6 +168,9 @@ exit $ret %endif %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 4.5.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jul 3 2024 Remi Collet - 4.5.5-1 - update to 4.5.5 From 2e6b0cacd00f408918d428d92666dddd92c73550 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Oct 2024 07:35:18 +0200 Subject: [PATCH 51/55] v4.5.6 --- .gitignore | 1 + php-sabre-vobject4.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index f33e41c..60fcf74 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ clog /php-sabre-vobject4-4.5.3-fe6d918.tgz /php-sabre-vobject4-4.5.4-a6d53a3.tgz /php-sabre-vobject4-4.5.5-7148cf5.tgz +/php-sabre-vobject4-4.5.6-900266b.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index bdf3fbb..338f40d 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 7148cf57d25aaba0a49f6656d37c35e8175b3087 +%global gh_commit 900266bb3bd448a9f7f41f82344ad0aba237cb27 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -20,8 +20,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.5.5 -Release: 2%{?dist} +Version: 4.5.6 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -43,10 +43,10 @@ BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" # "friendsofphp/php-cs-fixer": "^2.17.1", -# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", +# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.6", # "phpunit/php-invoker" : "^2.0 || ^3.1", -# "phpstan/phpstan": "^0.12" -BuildRequires: phpunit9 +# "phpstan/phpstan": "^0.12 || ^1.11" +BuildRequires: phpunit9 >= 9.6 %global phpunit %{_bindir}/phpunit9 %endif # Autoloader @@ -145,7 +145,7 @@ fi : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php81 php82 php83; do +for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -168,6 +168,9 @@ exit $ret %endif %changelog +* Tue Oct 15 2024 Remi Collet - 4.5.6-1 +- update to 4.5.6 + * Fri Jul 19 2024 Fedora Release Engineering - 4.5.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 033c186..341f73c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.5-7148cf5.tgz) = 6de05e4e85c5e44564b7b9f4d62a86cf478845a9f68be3a1d7373ebedaac7cf4df0995b2d373b5cde5a429fce708def7578fc209e44cc5a19c99812746c54609 +SHA512 (php-sabre-vobject4-4.5.6-900266b.tgz) = 5ee1c4cd29e4b5acdcfe62ca46a3a013abbfcab86a571259205c4d373f3d5fa1499ac9af521cf5c0c73a424ad4a93a9b18826aa7e157062ccac542c06f05f425 From 2537d91637ecb743f2c259bc112176c8609587cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:40:45 +0000 Subject: [PATCH 52/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 338f40d..1d20261 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -21,7 +21,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.5.6 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -168,6 +168,9 @@ exit $ret %endif %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 4.5.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Oct 15 2024 Remi Collet - 4.5.6-1 - update to 4.5.6 From 0a6a83ab200a2e07053d8ffdb52d19b05817662e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 22 Apr 2025 11:45:05 +0200 Subject: [PATCH 53/55] update to 4.5.7 re-license spec file to CECILL-2.1 --- .gitignore | 1 + php-sabre-vobject4.spec | 20 +++++++++++--------- sources | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 60fcf74..9128a86 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ clog /php-sabre-vobject4-4.5.4-a6d53a3.tgz /php-sabre-vobject4-4.5.5-7148cf5.tgz /php-sabre-vobject4-4.5.6-900266b.tgz +/php-sabre-vobject4-4.5.7-ff22611.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 1d20261..fc9e436 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -1,18 +1,16 @@ # remirepo/fedora spec file for php-sabre-vobject4 # -# Copyright (c) 2013-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # %bcond_without tests -# For compatibility with SCL -%undefine __brp_mangle_shebangs -%global gh_commit 900266bb3bd448a9f7f41f82344ad0aba237cb27 +%global gh_commit ff22611a53782e90c97be0d0bc4a5f98a5c0a12c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -20,8 +18,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.5.6 -Release: 2%{?dist} +Version: 4.5.7 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -45,7 +43,7 @@ BuildRequires: php-xml # "friendsofphp/php-cs-fixer": "^2.17.1", # "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.6", # "phpunit/php-invoker" : "^2.0 || ^3.1", -# "phpstan/phpstan": "^0.12 || ^1.11" +# "phpstan/phpstan": "^0.12 || ^1.12 || ^2.0" BuildRequires: phpunit9 >= 9.6 %global phpunit %{_bindir}/phpunit9 %endif @@ -168,6 +166,10 @@ exit $ret %endif %changelog +* Fri Apr 18 2025 Remi Collet - 4.5.7-1 +- update to 4.5.7 +- re-license spec file to CECILL-2.1 + * Sat Jan 18 2025 Fedora Release Engineering - 4.5.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 341f73c..03dac77 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.6-900266b.tgz) = 5ee1c4cd29e4b5acdcfe62ca46a3a013abbfcab86a571259205c4d373f3d5fa1499ac9af521cf5c0c73a424ad4a93a9b18826aa7e157062ccac542c06f05f425 +SHA512 (php-sabre-vobject4-4.5.7-ff22611.tgz) = d3b74a6cc3afc5ffd44e74d7c8b0b970536743867730c7eed55f4903b277417762fc195ff05f1c13cfd2f4c9a27dea3849980b95c1ecfc14f8d39475357f5532 From ca7b42d32bc1789ec5b9c3a92db9c00838bc2614 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:30:42 +0000 Subject: [PATCH 54/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-sabre-vobject4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index fc9e436..6bb4c8c 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -19,7 +19,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects Version: 4.5.7 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -166,6 +166,9 @@ exit $ret %endif %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.5.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Apr 18 2025 Remi Collet - 4.5.7-1 - update to 4.5.7 - re-license spec file to CECILL-2.1 From 716ccffe851a22bcb95847a4006781f994e0cd4a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Jan 2026 14:57:14 +0100 Subject: [PATCH 55/55] v4.5.8 --- .gitignore | 1 + php-sabre-vobject4.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 9128a86..7dc7872 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ clog /php-sabre-vobject4-4.5.5-7148cf5.tgz /php-sabre-vobject4-4.5.6-900266b.tgz /php-sabre-vobject4-4.5.7-ff22611.tgz +/php-sabre-vobject4-4.5.8-d554eb2.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 6bb4c8c..70d73ee 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-sabre-vobject4 # -# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet +# SPDX-FileCopyrightText: Copyright 2013-2026 Remi Collet # SPDX-License-Identifier: CECILL-2.1 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # @@ -10,7 +10,7 @@ %bcond_without tests -%global gh_commit ff22611a53782e90c97be0d0bc4a5f98a5c0a12c +%global gh_commit d554eb24d64232922e1eab5896cc2f84b3b9ffb1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -18,8 +18,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.5.7 -Release: 2%{?dist} +Version: 4.5.8 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD-3-Clause @@ -143,7 +143,7 @@ fi : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do +for cmdarg in "php %{phpunit}" php82 php83 php84; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -166,6 +166,9 @@ exit $ret %endif %changelog +* Mon Jan 12 2026 Remi Collet - 4.5.8-1 +- update to 4.5.8 + * Fri Jul 25 2025 Fedora Release Engineering - 4.5.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 03dac77..83fc031 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.7-ff22611.tgz) = d3b74a6cc3afc5ffd44e74d7c8b0b970536743867730c7eed55f4903b277417762fc195ff05f1c13cfd2f4c9a27dea3849980b95c1ecfc14f8d39475357f5532 +SHA512 (php-sabre-vobject4-4.5.8-d554eb2.tgz) = 8e6af0c7069430561b3764e7bf1b4a87979732749f8628a014f34a728c426bcdd3548e56fe398e0c18ae0140a692f9c839ef1d7482e1e06c599fa813c27429d5