diff options
| -rw-r--r-- | 469.patch | 22 | ||||
| -rw-r--r-- | php-sabre-vobject4.spec | 12 |
2 files changed, 7 insertions, 27 deletions
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 <remi@remirepo.net> -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 8784d78..2ab5ecc 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} @@ -103,7 +102,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 @@ -157,6 +155,10 @@ exit $ret %endif %changelog +* Thu Dec 19 2019 Remi Collet <remi@remirepo.net> - 4.2.1-1 +- update to 4.2.1 +- drop patch merged upstream + * Mon Oct 9 2019 Remi Collet <remi@remirepo.net> - 4.2.0-4 - add patch for PHP 7.4 from https://github.com/sabre-io/vobject/pull/469 |