diff options
| author | Remi Collet <remi@remirepo.net> | 2017-10-30 13:29:21 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-10-30 13:29:21 +0100 |
| commit | 79bab8e84cd25c4ec072a0d6c1faf03fe0332a1c (patch) | |
| tree | 6b0ed02c19944edd4990ded7e90d259a498b6384 | |
| parent | 149af07616805d593bb5a2920f89fdda06a96dbe (diff) | |
fix FTBFS fro mKoschei, add patch for test from https://github.com/sabre-io/vobject/pull/395
| -rw-r--r-- | 395.patch | 21 | ||||
| -rw-r--r-- | php-sabre-vobject4.spec | 9 |
2 files changed, 29 insertions, 1 deletions
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 <remi@remirepo.net> +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 09b4b4c..683a55d 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 <remi@remirepo.net> - 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 <remi@remirepo.net> - 4.1.3-1 - Update to 4.1.3 - sources from https://github.com/sabre-io/vobject |