Request 2811 (accepted)

Overview

Request 2811 (accepted)

Fix T446162

Created by vanmeeuwen over 3 years ago
In state accepted

Submit php-sabre-vobject

Submit package Kolab:Winterfell / php-sabre-vobject to package Kolab:16 / php-sabre-vobject

php-sabre-vobject.spec Changed

@@ -15,7 +15,7 @@
 Name:           php-%{gh_project}
 Summary:        Library to parse and manipulate iCalendar and vCard objects
 Version:        3.5.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 URL:            http://sabre.io/vobject/
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}.tar.gz
@@ -26,6 +26,7 @@
 Patch0:         %{gh_project}-bin.patch
 Patch1:         T41247.patch
 Patch2:         vobject_encoding_performance.patch
+Patch3:         T446162.patch
 
 BuildArch:      noarch
 %if %{with_tests}
@@ -63,6 +64,7 @@
 %patch0 -p0 -b .psr0
 %patch1 -p1 -b .T41247
 %patch2 -p1 -b .vobject_encoding_performance
+%patch3 -p1 -b .T446162
 
 : Create trivial PSR0 autoloader for tests
 cat <<EOF | tee psr0.php
@@ -110,6 +112,9 @@
 
 
 %changelog
+* Thu Jun 24 2021 Jeroen van Meeuwen (Apheleia IT) <vanmeeuwen@apheleia-it.ch> - 3.5.3-4
+- Add additional timezones (T446162)
+
 * Tue Sep 18 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.5.3-3
 - Improve encoding performance

T446162.patch Added

@@ -0,0 +1,62 @@
+From 284f8072bc678387510db663d4c2b148b02f7476 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak@kolabsys.com>
+Date: Wed, 13 Nov 2019 13:15:12 +0100
+Subject: [PATCH 1/2] Add some more Exchange timezone aliases (#464)
+
+---
+ lib/timezonedata/exchangezones.php | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/lib/timezonedata/exchangezones.php b/lib/timezonedata/exchangezones.php
+index 89bddc27..2dd7267b 100644
+--- a/lib/timezonedata/exchangezones.php
++++ b/lib/timezonedata/exchangezones.php
+@@ -74,19 +74,26 @@
+     'Greenland' => 'America/Godthab',
+     'Newfoundland' => 'America/St_Johns',
+     'Atlantic Time (Canada)' => 'America/Halifax',
++    'Atlantic Time' => 'America/Halifax',
+     'Caracas, La Paz' => 'America/Caracas',
+     'Santiago' => 'America/Santiago',
+     'Bogota, Lima, Quito' => 'America/Bogota',
+     'Eastern Time (US & Canada)' => 'America/New_York',
++    'Eastern Time' => 'America/New_York',
+     'Indiana (East)' => 'America/Indiana/Indianapolis',
++    'Indiana' => 'America/Indiana/Indianapolis',
+     'Central America' => 'America/Guatemala',
+     'Central Time (US & Canada)' => 'America/Chicago',
++    'Central Time' => 'America/Chicago',
+     'Mexico City, Tegucigalpa' => 'America/Mexico_City',
+     'Saskatchewan' => 'America/Edmonton',
+     'Arizona' => 'America/Phoenix',
+     'Mountain Time (US & Canada)' => 'America/Denver', // Best guess
++    'Mountain Time' => 'America/Denver', // Best guess
+     'Pacific Time (US & Canada)' => 'America/Los_Angeles', // Best guess
++    'Pacific Time' => 'America/Los_Angeles', // Best guess
+     'Pacific Time (US & Canada); Tijuana' => 'America/Los_Angeles', // Best guess
++    'Pacific Time; Tijuana' => 'America/Los_Angeles', // Best guess
+     'Alaska' => 'America/Anchorage',
+     'Hawaii' => 'Pacific/Honolulu',
+     'Midway Island, Samoa' => 'Pacific/Midway',
+
+From b2d082b783f5664c12084ece80856fee3cafd48e Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak@kolabsys.com>
+Date: Mon, 14 Jun 2021 11:15:19 +0200
+Subject: [PATCH 2/2] Add timezone alias (#535)
+
+---
+ lib/timezonedata/exchangezones.php | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/timezonedata/exchangezones.php b/lib/timezonedata/exchangezones.php
+index 2dd7267b..c8adf2e1 100644
+--- a/lib/timezonedata/exchangezones.php
++++ b/lib/timezonedata/exchangezones.php
+@@ -48,6 +48,7 @@
+     'Bangkok, Hanoi, Jakarta' => 'Asia/Bangkok',
+     'Krasnoyarsk' => 'Asia/Krasnoyarsk',
+     'Beijing, Chongqing, Hong Kong SAR, Urumqi' => 'Asia/Shanghai',
++    'Beijing, Chongqing, Hong Kong, Urumqi' => 'Asia/Shanghai',
+     'Irkutsk, Ulaan Bataar' => 'Asia/Irkutsk',
+     'Kuala Lumpur, Singapore' => 'Asia/Singapore',
+     'Perth, Western Australia' => 'Australia/Perth',

debian.changelog Changed

debian.series Changed

php-sabre-vobject.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2811 0

Request History

vanmeeuwen created request over 3 years ago

Fix T446162

vanmeeuwen accepted review over 3 years ago

vanmeeuwen approved review over 3 years ago

vanmeeuwen accepted request over 3 years ago