!4 modify timezone from Macau to Macao
Merge pull request !4 from huzunhao/master
This commit is contained in:
openeuler-ci-bot
Gitee
commit
b78fdf656b
95
0001-modify-timezone-from-Macau-to-Macao.patch
Normal file
95
0001-modify-timezone-from-Macau-to-Macao.patch
Normal file
@ -0,0 +1,95 @@
|
||||
From 3d06fb69e66a519b11e4d4750c622210e6e7f0b5 Mon Sep 17 00:00:00 2001
|
||||
Date: Tue, 21 Jan 2020 15:14:50 +0800
|
||||
Subject: [PATCH] modify timezone from Macau to Macao
|
||||
|
||||
---
|
||||
pytz.egg-info/SOURCES.txt | 3 +--
|
||||
pytz/zoneinfo/iso3166.tab | 2 +-
|
||||
pytz/zoneinfo/tzdata.zi | 4 ++--
|
||||
pytz/zoneinfo/zone.tab | 2 +-
|
||||
pytz/zoneinfo/zone1970.tab | 2 +-
|
||||
5 files changed, 6 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/pytz.egg-info/SOURCES.txt b/pytz.egg-info/SOURCES.txt
|
||||
index ecc09e9..a61115b 100644
|
||||
--- a/pytz.egg-info/SOURCES.txt
|
||||
+++ b/pytz.egg-info/SOURCES.txt
|
||||
@@ -355,7 +355,6 @@ pytz/zoneinfo/Asia/Kuala_Lumpur
|
||||
pytz/zoneinfo/Asia/Kuching
|
||||
pytz/zoneinfo/Asia/Kuwait
|
||||
pytz/zoneinfo/Asia/Macao
|
||||
-pytz/zoneinfo/Asia/Macau
|
||||
pytz/zoneinfo/Asia/Magadan
|
||||
pytz/zoneinfo/Asia/Makassar
|
||||
pytz/zoneinfo/Asia/Manila
|
||||
@@ -615,4 +614,4 @@ pytz/zoneinfo/US/Indiana-Starke
|
||||
pytz/zoneinfo/US/Michigan
|
||||
pytz/zoneinfo/US/Mountain
|
||||
pytz/zoneinfo/US/Pacific
|
||||
-pytz/zoneinfo/US/Samoa
|
||||
\ No newline at end of file
|
||||
+pytz/zoneinfo/US/Samoa
|
||||
diff --git a/pytz/zoneinfo/iso3166.tab b/pytz/zoneinfo/iso3166.tab
|
||||
index a4ff61a..1c53cc0 100644
|
||||
--- a/pytz/zoneinfo/iso3166.tab
|
||||
+++ b/pytz/zoneinfo/iso3166.tab
|
||||
@@ -170,7 +170,7 @@ MK North Macedonia
|
||||
ML Mali
|
||||
MM Myanmar (Burma)
|
||||
MN Mongolia
|
||||
-MO Macau
|
||||
+MO Macao
|
||||
MP Northern Mariana Islands
|
||||
MQ Martinique
|
||||
MR Mauritania
|
||||
diff --git a/pytz/zoneinfo/tzdata.zi b/pytz/zoneinfo/tzdata.zi
|
||||
index c720561..cf0c701 100644
|
||||
--- a/pytz/zoneinfo/tzdata.zi
|
||||
+++ b/pytz/zoneinfo/tzdata.zi
|
||||
@@ -584,7 +584,7 @@ R _ 1973 o - D 30 3:30 1 D
|
||||
R _ 1975 1976 - Ap Su>=16 3:30 1 D
|
||||
R _ 1979 o - May 13 3:30 1 D
|
||||
R _ 1979 o - O Su>=16 3:30 0 S
|
||||
-Z Asia/Macau 7:34:10 - LMT 1904 O 30
|
||||
+Z Asia/Macao 7:34:10 - LMT 1904 O 30
|
||||
8 - CST 1941 D 21 23
|
||||
9 _ +09/+10 1945 S 30 24
|
||||
8 _ C%sT
|
||||
@@ -4324,7 +4324,7 @@ L Asia/Dhaka Asia/Dacca
|
||||
L Asia/Shanghai Asia/Harbin
|
||||
L Asia/Urumqi Asia/Kashgar
|
||||
L Asia/Kathmandu Asia/Katmandu
|
||||
-L Asia/Macau Asia/Macao
|
||||
+L Asia/Macao Asia/Macao
|
||||
L Asia/Yangon Asia/Rangoon
|
||||
L Asia/Ho_Chi_Minh Asia/Saigon
|
||||
L Asia/Jerusalem Asia/Tel_Aviv
|
||||
diff --git a/pytz/zoneinfo/zone.tab b/pytz/zoneinfo/zone.tab
|
||||
index 408fcb2..ee58572 100644
|
||||
--- a/pytz/zoneinfo/zone.tab
|
||||
+++ b/pytz/zoneinfo/zone.tab
|
||||
@@ -269,7 +269,7 @@ MM +1647+09610 Asia/Yangon
|
||||
MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas)
|
||||
MN +4801+09139 Asia/Hovd Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
|
||||
MN +4804+11430 Asia/Choibalsan Dornod, Sukhbaatar
|
||||
-MO +221150+1133230 Asia/Macau
|
||||
+MO +221150+1133230 Asia/Macao
|
||||
MP +1512+14545 Pacific/Saipan
|
||||
MQ +1436-06105 America/Martinique
|
||||
MR +1806-01557 Africa/Nouakchott
|
||||
diff --git a/pytz/zoneinfo/zone1970.tab b/pytz/zoneinfo/zone1970.tab
|
||||
index 822ffa1..03ec66b 100644
|
||||
--- a/pytz/zoneinfo/zone1970.tab
|
||||
+++ b/pytz/zoneinfo/zone1970.tab
|
||||
@@ -232,7 +232,7 @@ MM +1647+09610 Asia/Yangon
|
||||
MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas)
|
||||
MN +4801+09139 Asia/Hovd Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan
|
||||
MN +4804+11430 Asia/Choibalsan Dornod, Sükhbaatar
|
||||
-MO +221150+1133230 Asia/Macau
|
||||
+MO +221150+1133230 Asia/Macao
|
||||
MQ +1436-06105 America/Martinique
|
||||
MT +3554+01431 Europe/Malta
|
||||
MU -2010+05730 Indian/Mauritius
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
11
pytz.spec
11
pytz.spec
@ -1,6 +1,6 @@
|
||||
Name: pytz
|
||||
Version: 2019.2
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: World Timezone Definitions for Python
|
||||
License: MIT
|
||||
URL: http://pytz.sourceforge.net/
|
||||
@ -8,6 +8,7 @@ Source0: https://github.com/stub42/pytz/archive/pytz-2019.2.tar.gz
|
||||
|
||||
Patch0: pytz-zoneinfo.patch
|
||||
Patch1: remove_tzinfo_test.patch
|
||||
Patch9000: 0001-modify-timezone-from-Macau-to-Macao.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
@ -49,10 +50,12 @@ python3 for pytz
|
||||
%py2_install
|
||||
rm -r %{buildroot}%{python2_sitelib}/pytz/zoneinfo
|
||||
pathfix.py -pn -i %{__python2} %{buildroot}%{python2_sitelib}
|
||||
sed -i '/pytz\/zoneinfo\/Asia\/Macau/d' %{buildroot}%{python2_sitelib}/*.egg-info/SOURCES.txt
|
||||
|
||||
%py3_install
|
||||
rm -r %{buildroot}%{python3_sitelib}/pytz/zoneinfo
|
||||
pathfix.py -pn -i %{__python3} %{buildroot}%{python3_sitelib}
|
||||
sed -i '/pytz\/zoneinfo\/Asia\/Macau/d' %{buildroot}%{python3_sitelib}/*.egg-info/SOURCES.txt
|
||||
|
||||
%check
|
||||
PYTHONPATH=%{buildroot}%{python2_sitelib} %{__python2} -m pytest -v
|
||||
@ -71,5 +74,11 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v
|
||||
%{python3_sitelib}/*
|
||||
|
||||
%changelog
|
||||
* Tue Jan 21 2020 openEuler Buildteam <buildteam@openeuler.org> - 2019.2-2
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:reboot
|
||||
- DESC:modify timezone from Macau to Macao
|
||||
|
||||
* Thu Sep 12 2019 openEuler Buildteam <buildteam@openeuler.org> - 2019.2-1
|
||||
- Package init
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user