diff --git a/0001-libweather-modification-summary.patch b/0001-libweather-modification-summary.patch new file mode 100644 index 0000000..a4a9c5e --- /dev/null +++ b/0001-libweather-modification-summary.patch @@ -0,0 +1,97 @@ +From c9de14ddd586a9e4660ae6ae0c43665ef023e0b0 Mon Sep 17 00:00:00 2001 +From: huzunhao +Date: Sat, 21 Dec 2019 18:09:08 +0800 +Subject: [PATCH] libweather: modify Macau to Macao + +reason:modify Macau to Macao + +Signed-off-by: huzunhao +--- + data/Locations.xml | 14 +++++++------- + po-locations/zh_CN.po | 12 ++++++------ + 2 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/data/Locations.xml b/data/Locations.xml +index 77f0539..0dcc3d8 100644 +--- a/data/Locations.xml ++++ b/data/Locations.xml +@@ -5097,31 +5097,31 @@ + + + +- <_name msgctxt="Country">Macau ++ <_name msgctxt="Country">Macao + MO + MC + +- ++ + +- Asia/Macau ++ Asia/Macao + + Taipa + VMMC + 22.166667 113.566667 + + +- +- <_name msgctxt="City in Macau">Macau ++ <_name msgctxt="City in Macao">Macao + 22.200556 113.546111 + + +- + <_name>Taipa +diff --git a/po-locations/zh_CN.po b/po-locations/zh_CN.po +index 1e43088..4ef886b 100644 +--- a/po-locations/zh_CN.po ++++ b/po-locations/zh_CN.po +@@ -627,12 +627,12 @@ msgid "Luxembourg" + msgstr "卢森堡" + + #. MO - Macao, aka "Macao Special Administrative Region of +-#. China". (The spellings "Macao" and "Macau" are both widely ++#. China". (The spellings "Macao" and "Macao" are both widely + #. used. The "u" spelling is currently slightly more popular in + #. English.) + #. + msgctxt "Country" +-msgid "Macau" ++msgid "Macao" + msgstr "中国澳门" + + #. MK - The Former Yugoslav Republic of Macedonia +@@ -8959,14 +8959,14 @@ msgctxt "City in Luxembourg" + msgid "Luxembourg" + msgstr "卢森堡" + +-#. The capital of Macau. ++#. The capital of Macao. + #. The local name in Chinese is "Aomen / 澳门". + #. +-msgctxt "City in Macau" +-msgid "Macau" ++msgctxt "City in Macao" ++msgid "Macao" + msgstr "澳门" + +-#. A city in Macau. ++#. A city in Macao. + #. The local name in Chinese is "Dangzai / 氹仔". + #. + msgid "Taipa" +-- +2.19.1 + diff --git a/libgweather.spec b/libgweather.spec index 558254c..019b7bc 100644 --- a/libgweather.spec +++ b/libgweather.spec @@ -1,12 +1,14 @@ Name: libgweather Version: 3.32.2 -Release: 1 +Release: 3 Summary: A library for weather information License: GPLv2+ URL: https://wiki.gnome.org/Projects/LibGWeather Source0: https://download.gnome.org/sources/libgweather/3.32/%{name}-%{version}.tar.xz +Patch9000: 0001-libweather-modification-summary.patch + BuildRequires: gettext gtk-doc meson vala geocode-glib-devel glade-devel BuildRequires: gobject-introspection-devel gtk3-devel libsoup-devel libxml2-devel @@ -58,6 +60,17 @@ developing applications that use %{name}. %{_datadir}/gtk-doc/html/libgweather/ %changelog +* Mon Dec 23 2019 openEuler Buildteam - 3.32.2-3 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:modify the patch + +* Sat Dec 21 2019 openEuler Buildteam - 3.32.2-2 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:bugfix about translations from Macau to Macao + * Fri Sep 20 2019 openEuler Buildteam - 3.32.2-1 - Package init -