From c9accfd703c33b47ba0351302359967d635d3ee3 Mon Sep 17 00:00:00 2001 From: yangxianzhao Date: Thu, 28 Dec 2023 13:37:05 +0800 Subject: [PATCH] fix Taiwan province name --- 0001-fix-Taiwan-province-name.patch | 57 +++++++++++++++++++++++++++++ iso-codes.spec | 9 ++++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 0001-fix-Taiwan-province-name.patch diff --git a/0001-fix-Taiwan-province-name.patch b/0001-fix-Taiwan-province-name.patch new file mode 100644 index 0000000..d52bb66 --- /dev/null +++ b/0001-fix-Taiwan-province-name.patch @@ -0,0 +1,57 @@ +From e8a6284cb5b49d4a342aa29d92903fa52a5b5c1c Mon Sep 17 00:00:00 2001 +From: yangxianzhao +Date: Thu, 28 Dec 2023 13:28:21 +0800 +Subject: [PATCH] fix Taiwan province name + +--- + iso_3166/zh_HK.po | 6 +++--- + iso_3166/zh_TW.po | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/iso_3166/zh_HK.po b/iso_3166/zh_HK.po +index 05f34c3..25302a2 100644 +--- a/iso_3166/zh_HK.po ++++ b/iso_3166/zh_HK.po +@@ -685,7 +685,7 @@ msgstr "香港" + + #. official_name for HKG + msgid "Hong Kong Special Administrative Region of China" +-msgstr "香港特別行政區" ++msgstr "中國香港特別行政區" + + #. name for HUN, official_name for HUN + msgid "Hungary" +@@ -898,7 +898,7 @@ msgstr "澳門" + + #. official_name for MAC + msgid "Macao Special Administrative Region of China" +-msgstr "澳門特別行政區" ++msgstr "中國澳門特別行政區" + + #. name for MKD + msgid "Macedonia, Republic of" +@@ -1495,7 +1495,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/zh_TW.po b/iso_3166/zh_TW.po +index 6c211c4..9ede959 100644 +--- a/iso_3166/zh_TW.po ++++ b/iso_3166/zh_TW.po +@@ -1472,7 +1472,7 @@ msgstr "敘利亞阿拉伯共和國" + + #. name for TWN, official_name for TWN + msgid "Taiwan, Province of China" +-msgstr "中華民國" ++msgstr "中國台灣省" + + #. common_name for TWN + msgid "Taiwan" +-- +2.31.1 + diff --git a/iso-codes.spec b/iso-codes.spec index a4e1bbd..2acd78f 100644 --- a/iso-codes.spec +++ b/iso-codes.spec @@ -1,11 +1,14 @@ +%define anolis_release .0.1 Name: iso-codes Summary: ISO code lists and translations Version: 3.46 -Release: 2%{?dist} +Release: 2%{anolis_release}%{?dist} License: LGPLv2+ Group: System Environment/Base URL: http://alioth.debian.org/projects/pkg-isocodes/ Source0: http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-%{version}.tar.xz + +Patch1000: 0001-fix-Taiwan-province-name.patch BuildRequires: gettext BuildArch: noarch # for /usr/share/xml @@ -28,6 +31,7 @@ when building programs that use %{name}. %prep %setup -q +%patch1000 -p1 %build %configure @@ -47,6 +51,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %{_datadir}/pkgconfig/iso-codes.pc %changelog +* Thu Dec 28 2023 yangxianzhao - 3.46-2.0.1 +- Fix Taiwan province name + * Fri Dec 27 2013 Daniel Mach - 3.46-2 - Mass rebuild 2013-12-27 -- Gitee