From 271d3bb093c38d62e656414e3af72a064b3a2bf0 Mon Sep 17 00:00:00 2001 From: fengtao Date: Tue, 21 Jan 2020 14:35:22 +0800 Subject: [PATCH] modify timezone from Macau to Macao --- 0001-modify-timezone-Macau-to-Macao.patch | 69 +++++++++++++++++++++++ libtimezonemap.spec | 11 +++- 2 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 0001-modify-timezone-Macau-to-Macao.patch diff --git a/0001-modify-timezone-Macau-to-Macao.patch b/0001-modify-timezone-Macau-to-Macao.patch new file mode 100644 index 0000000..8caa1a5 --- /dev/null +++ b/0001-modify-timezone-Macau-to-Macao.patch @@ -0,0 +1,69 @@ +From f2c56b6e649d7a656699026df95232daf57a3386 Mon Sep 17 00:00:00 2001 +Date: Tue, 21 Jan 2020 14:24:07 +0800 +Subject: [PATCH] modify timezone Macau to Macao + +--- + timezonemap-0.4.5.1/src/data/admin1Codes.txt | 2 +- + timezonemap-0.4.5.1/src/data/backward | 1 - + timezonemap-0.4.5.1/src/data/cities15000.txt | 6 +++--- + 3 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/data/admin1Codes.txt b/src/data/admin1Codes.txt +index ec16ff5..c89951c 100644 +--- a/src/data/admin1Codes.txt ++++ b/src/data/admin1Codes.txt +@@ -2123,7 +2123,7 @@ MN.01 Arhangay Arhangay 2032855 + MN.23 Darhan Uul Darhan Uul 2055111 + MN.24 Govĭ-Sumber Govi-Sumber 2055112 + MN.25 Orhon Orhon 2055113 +-MO.02 Macau Macau 1821273 ++MO.02 Macao Macao 1821273 + MO.01 Ilhas Ilhas 1821286 + MP.100 Rota Rota 4041530 + MP.110 Saipan Saipan 4041552 +diff --git a/src/data/backward b/src/data/backward +index aab237a..e148151 100644 +--- a/src/data/backward ++++ b/src/data/backward +@@ -35,7 +35,6 @@ Link Asia/Dhaka Asia/Dacca + Link Asia/Shanghai Asia/Harbin + Link Asia/Urumqi Asia/Kashgar + Link Asia/Kathmandu Asia/Katmandu +-Link Asia/Macau Asia/Macao + Link Asia/Ho_Chi_Minh Asia/Saigon + Link Asia/Jerusalem Asia/Tel_Aviv + Link Asia/Thimphu Asia/Thimbu +diff --git a/src/data/cities15000.txt b/src/data/cities15000.txt +index 0df4d21..3d2fcc1 100644 +--- a/src/data/cities15000.txt ++++ b/src/data/cities15000.txt +@@ -1237,7 +1237,7 @@ + 3395503 Marabá Maraba MAB,Maraba,Marabá,Marada,ma la ba,malaba,maraba,Мараба,مارابا,মারাবা,马拉巴,마라바 -5.36861 -49.11778 P PPL BR 16 1504208 145860 101 America/Belem 2012-08-03 + 3395717 Mamanguape Mamanguape -6.83861 -35.12611 P PPL BR 17 2508901 27606 39 America/Fortaleza 2012-08-03 + 3395981 Maceió Maceio MCZ,Macayo,Maceio,Maceió,Masejas,Masejo,Maseyo,Maçayó,ma sai yue,ma se xo,masayw,mase'i'o,maseio,masyyw,msyyʼw,Масейо,Масејо,מסייאו,ماسئیو,ماسايو,মাসেইও,มาเซโอ,მასეიო,マセイオ,马塞约,마세이오 -9.66583 -35.73528 P PPLA BR 02 2704302 954991 11 America/Maceio 2010-01-21 +-3395998 Macau Macau Macao,Macáo -5.115 -36.63444 P PPL BR 22 2407203 18070 7 America/Fortaleza 2012-08-03 ++3395998 Macao Macao Macao,Macáo -5.115 -36.63444 P PPL BR 22 2407203 18070 7 America/Fortaleza 2012-08-03 + 3396016 Macapá Macapa MCP,Macapa,Macapá,Makapa,ma ka pa,makaba,makapa,Макапа,מקאפה,ماكابا,ماکاپا,मकापा,মাকাপা,มากาปา,მაკაპა,マカパ,馬卡帕,마카파 0.03889 -51.06639 P PPLA BR 03 1600303 338936 17 America/Belem 2012-08-03 + 3396048 Macaíba Macaiba Macahyba -5.85833 -35.35389 P PPL BR 22 2407104 40015 16 America/Fortaleza 2012-08-03 + 3396266 Limoeiro do Norte Limoeiro do Norte Limoeiro -5.14556 -38.09806 P PPL BR 06 2307601 29449 35 America/Fortaleza 2012-08-03 +@@ -8407,7 +8407,7 @@ + 717635 Mezőtúr Mezotur Mezoetur,Mezotur,Mezötúr,Mezőtúr 47 20.63333 P PPLA2 HU 20 19168 82 Europe/Budapest 2014-11-05 + 717652 Mezőkövesd Mezokovesd Mezokovesd,Mezőkövesd 47.81667 20.58333 P PPLA2 HU 04 17701 117 Europe/Budapest 2014-11-05 + 717771 Mátészalka Mateszalka Mateszalka,Mátészalka 47.95528 22.32348 P PPLA2 HU 18 18718 124 Europe/Budapest 2014-11-05 +-717902 Makó Mako Macau,Macău,Mako,Makov,Makovo,Makó,makw,mao ke,meoko,Мако,מאקו,מאקעווע,ماکو,毛科,머코 46.21667 20.48333 P PPLA2 HU 06 25135 81 Europe/Budapest 2014-11-05 ++717902 Makó Mako Macao,Macău,Mako,Makov,Makovo,Makó,makw,mao ke,meoko,Мако,מאקו,מאקעווע,ماکو,毛科,머코 46.21667 20.48333 P PPLA2 HU 06 25135 81 Europe/Budapest 2014-11-05 + 718739 Kisvárda Kisvarda Kisvarda,Kisvárda 48.21667 22.08333 P PPLA2 HU 18 18190 106 Europe/Budapest 2014-11-05 + 719311 Kazincbarcika Kazincbarcika Kazincbarcika,Sajokazinc,Sajókazinc,kao jin ci bao er qi kao,kazyntbartyka,Казинцбарцика,کازینتبارتیکا,考津茨包爾齊考 48.25 20.63333 P PPLA2 HU 04 32396 185 Europe/Budapest 2014-11-05 + 719404 Karcag Karcag Karcag,Karcage,Карцаге 47.31667 20.93333 P PPLA2 HU 20 22370 85 Europe/Budapest 2014-11-05 +@@ -13922,7 +13922,7 @@ + 2032614 Baruun-Urt Baruun-Urt Baruun Urta,Baruun-Urt,Burunurt,Dzhapkhalanta-sharga,Dzhibkhalantu-Sharga,Jibhalanta Sharga Suma,Jibholantu Sharga sumu,Jibhulantu sharga,Sharga Sume,UUN,Баруун-Урт 46.68056 113.27917 P PPLA MN 17 15805 991 Asia/Choibalsan 2009-06-30 + 2032814 Arvayheer Arvayheer Arbai Khere,Arbay Heere,Arbay Khere,Arbay hure,Arbayin Khure,Arbayin hure,Arubai gere,Arvajkhehehr,Arvayheer,Arwaikheer,Arwaïkheer,Obor Hangayin,Obor Khangai,Obör Hangayin,Ts'ai-ku-na Miao,Ts'ai-ku-na Ya-men,Ts’ai-ku-na Miao,Ts’ai-ku-na Ya-men,Ubur Khangaiin,Ubur Khangaun,Ubur Khangayin,Ubur Khangaün,Ubur-hangaajin,Ubur-hangayin,Öbör Khangai,Арвайхээр 46.26389 102.775 P PPLA MN 15 25622 1838 Asia/Ulaanbaatar 2013-08-04 + 7648817 Зуунмод Zuunmod 47.70693 106.95276 P PPL MN 18 17630 1514 Asia/Ulaanbaatar 2011-02-05 +-1821274 Macau Macau Aomen,Aomin',Au-mun,Aumwnz,Aumyn,Cidade de Macau,Cidade do Santo Nome de Deus de Macau,MFM,Ma Cao,Macao,Macau,Macaum,Makaa,Makaaw,Makao,Makaou,Makau,Makaw,Makawo,Makaó,Makee,Makèë,Màkáù,O-muong,ao men,maka,maka'o,maka'u,makao,makavu,makaw,makayw,makkavu,mkaw,Àu-mûn,Ó̤-muòng,Μακάου,Аоминь,Аумын,Макаа,Макао,מקאו,ئاۋمېن,ماكاو,ماکائو,مکاؤ,މަކާއޫ,मकाउ,मकाओ,মাকাউ,ਮਕਾਉ,મકાઉ,மக்காவு,మకావు,ಮಕಾವು,മകൗ,เขตบริหารพิเศษมาเก๊า,မကာအို,მაკაო,マカオ,澳門,澳门,마카오 22.20056 113.54611 P PPLC MO 02 520400 22 Asia/Macau 2011-10-27 ++1821274 Macao Macao Aomen,Aomin',Au-mun,Aumwnz,Aumyn,Cidade de Macao,Cidade do Santo Nome de Deus de Macao,MFM,Ma Cao,Macao,Macao,Macaum,Makaa,Makaaw,Makao,Makaou,Makau,Makaw,Makawo,Makaó,Makee,Makèë,Màkáù,O-muong,ao men,maka,maka'o,maka'u,makao,makavu,makaw,makayw,makkavu,mkaw,Àu-mûn,Ó̤-muòng,Μακάου,Аоминь,Аумын,Макаа,Макао,מקאו,ئاۋمېن,ماكاو,ماکائو,مکاؤ,މަކާއޫ,मकाउ,मकाओ,মাকাউ,ਮਕਾਉ,મકાઉ,மக்காவு,మకావు,ಮಕಾವು,മകൗ,เขตบริหารพิเศษมาเก๊า,မကာအို,მაკაო,マカオ,澳門,澳门,마카오 22.20056 113.54611 P PPLC MO 02 520400 22 Asia/Macao 2011-10-27 + 7828758 Saipan Saipan SPN,Saipan 15.21233 145.7545 P PPLC MP 110 48220 5 211 Pacific/Saipan 2014-08-19 + 3569915 Saint-Joseph Saint-Joseph Saint-Joseph 14.67099 -61.03905 P PPL MQ MQ 972 9721 97224 16974 138 America/Martinique 2014-09-21 + 3569926 Sainte-Marie Sainte-Marie Sainte-Marie,Sent-Mari,Сент-Мари 14.78392 -60.99274 P PPL MQ MQ 972 9722 97228 20380 13 America/Martinique 2012-01-18 +-- +1.8.3.1 + diff --git a/libtimezonemap.spec b/libtimezonemap.spec index 7ea30e6..ae8950a 100644 --- a/libtimezonemap.spec +++ b/libtimezonemap.spec @@ -1,10 +1,11 @@ Name: libtimezonemap Version: 0.4.5.1 -Release: 5 +Release: 6 Summary: A GTK+3 timezone map widget License: GPLv3 URL: https://launchpad.net/timezonemap Source0: https://github.com/dashea/timezonemap/archive/timezonemap-%{version}.tar.gz +Patch9000: 0001-modify-timezone-Macau-to-Macao.patch BuildRequires: glib2-devel gnome-common gobject-introspection-devel gtk3-devel BuildRequires: json-glib-devel librsvg2-devel libsoup-devel @@ -27,7 +28,7 @@ The package contains header files used for building applications that use %{name %package_help %prep -%autosetup -n timezonemap-%{version} +%autosetup -n timezonemap-%{version} -p1 %build ./autogen.sh @@ -61,5 +62,11 @@ The package contains header files used for building applications that use %{name %doc README TODO NEWS ChangeLog %changelog +* Tue Jan 21 2020 openEuler Buildteam - 0.4.5.1-6 +- Type:bugfix +- ID:NA +- SUG:reboot +- DESC:modify timezone from Macau to Macao + * Fri Oct 11 2019 openEuler Buildteam - 0.4.5.1-5 - Package init