From 81b3234ccd9aa42fe20da3628b8194b1316052f3 Mon Sep 17 00:00:00 2001 From: Chunmei Xu Date: Mon, 3 Apr 2023 12:00:15 +0800 Subject: [PATCH] fix province name Signed-off-by: Chunmei Xu --- 1000-fix-province-name.patch | 58 ++++++++++++++++++++++++++++++++++++ iso-codes.spec | 10 +++++-- 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 1000-fix-province-name.patch diff --git a/1000-fix-province-name.patch b/1000-fix-province-name.patch new file mode 100644 index 0000000..9b54fba --- /dev/null +++ b/1000-fix-province-name.patch @@ -0,0 +1,58 @@ +From 38f71e2c7b68877b8ad270b93e0b82af91b336c6 Mon Sep 17 00:00:00 2001 +From: Chunmei Xu +Date: Mon, 3 Apr 2023 11:58:12 +0800 +Subject: [PATCH] fix province name + +Signed-off-by: Chunmei Xu +--- + iso_3166-1/zh_HK.po | 6 +++--- + iso_3166-1/zh_TW.po | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/iso_3166-1/zh_HK.po b/iso_3166-1/zh_HK.po +index a258660..b9ed216 100644 +--- a/iso_3166-1/zh_HK.po ++++ b/iso_3166-1/zh_HK.po +@@ -665,7 +665,7 @@ msgstr "香港" + + #. Official name for HKG + msgid "Hong Kong Special Administrative Region of China" +-msgstr "香港特別行政區" ++msgstr "中國香港特別行政區" + + #. Name for HMD + msgid "Heard Island and McDonald Islands" +@@ -931,7 +931,7 @@ msgstr "澳門" + + #. Official name for MAC + msgid "Macao Special Administrative Region of China" +-msgstr "澳門特別行政區" ++msgstr "中國澳門特別行政區" + + #. Name for MAF + msgid "Saint Martin (French part)" +@@ -1572,7 +1572,7 @@ msgstr "圖瓦盧" + + #. Name for TWN, Official name for TWN + msgid "Taiwan, Province of China" +-msgstr "中華民國" ++msgstr "中國台灣省" + + #. Common name for TWN + msgid "Taiwan" +diff --git a/iso_3166-1/zh_TW.po b/iso_3166-1/zh_TW.po +index bb03185..9c330a4 100644 +--- a/iso_3166-1/zh_TW.po ++++ b/iso_3166-1/zh_TW.po +@@ -1562,7 +1562,7 @@ msgstr "吐瓦魯" + + #. Name for TWN, Official name for TWN + msgid "Taiwan, Province of China" +-msgstr "中華民國" ++msgstr "中國台灣省" + + #. Common name for TWN + msgid "Taiwan" +-- +2.19.1.6.gb485710b + diff --git a/iso-codes.spec b/iso-codes.spec index 593f418..29e5daa 100644 --- a/iso-codes.spec +++ b/iso-codes.spec @@ -1,4 +1,5 @@ -%define anolis_release 1 +%define anolis_release 2 + Name: iso-codes Summary: ISO code lists and translations Version: 4.12.0 @@ -7,6 +8,8 @@ License: LGPLv2+ URL: https://salsa.debian.org/iso-codes-team/iso-codes Source0: %{url}/-/archive/v%{version}/%{name}-v%{version}.tar.gz +Patch1000: 1000-fix-province-name.patch + BuildRequires: gettext BuildRequires: python3 BuildRequires: make @@ -37,7 +40,7 @@ This package contains the pkg-config files for development when building programs that use %{name}. %prep -%autosetup -n %{name}-v%{version} +%autosetup -p1 -n %{name}-v%{version} %build %configure @@ -61,6 +64,9 @@ when building programs that use %{name}. %{_datadir}/pkgconfig/iso-codes.pc %changelog +* Mon Apr 03 2023 Chunmei Xu - 4.12.0-2 +- fix province name + * Tue Jan 31 2023 yuanhui - 4.12.0-1 - update to 4.12.0 -- Gitee