From 668c0dff36f0352ac27df7bee60d9c60e0d5a1d1 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Mon, 16 Sep 2024 23:46:59 +0900 Subject: [PATCH] Fix a forbidden code point, 0x202E Backport cldr-release-46-alpha2 to resolve rpminspect.static-analysis Resolves: RHEL-56890 --- ...nnotation-rhel56890-forbidden-0x202e.patch | 42 +++++++++++++++++++ cldr-emoji-annotation.spec | 6 ++- 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 cldr-emoji-annotation-rhel56890-forbidden-0x202e.patch diff --git a/cldr-emoji-annotation-rhel56890-forbidden-0x202e.patch b/cldr-emoji-annotation-rhel56890-forbidden-0x202e.patch new file mode 100644 index 0000000..83d7ac0 --- /dev/null +++ b/cldr-emoji-annotation-rhel56890-forbidden-0x202e.patch @@ -0,0 +1,42 @@ +From 71b43c994147390e76fa3b1fa7af2f3aa7afa2d2 Mon Sep 17 00:00:00 2001 +From: Takao Fujiwara +Date: Mon, 16 Sep 2024 23:00:32 +0900 +Subject: [PATCH] Fix a forbidden code point, 0x202E + +Backport cldr-release-46-alpha2 to resolve rpminspect.static-analysis +--- + common/annotationsDerived/ff_Adlm.xml | 4 ++-- + .../org/unicode/cldr/util/data/external/langtags.json | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/common/annotationsDerived/ff_Adlm.xml b/common/annotationsDerived/ff_Adlm.xml +index 5b4070c..f955143 100644 +--- a/common/annotationsDerived/ff_Adlm.xml ++++ b/common/annotationsDerived/ff_Adlm.xml +@@ -90,8 +90,8 @@ Derived short names and annotations, using GenerateDerivedAnnotations.java. See + 𞤼𞤵𞤼𞤢𞤱𞤢𞤤: 𞤄𞤵𞥅𞤼𞤢𞥄𞤲 + 𞤼𞤵𞤼𞤢𞤱𞤢𞤤 | 𞤼𞤵𞤼𞤢𞤱𞤢𞤤: 𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤄𞤵𞥅𞤾𞤫𞥅 + 𞤼𞤵𞤼𞤢𞤱𞤢𞤤: 𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤄𞤵𞥅𞤾𞤫𞥅 +- 𞤼𞤵𞤼𞤢𞤱𞤢𞤤 | 𞤼𞤵𞤼𞤢𞤱𞤢𞤤: ‮𞤄𞤮𞤼𞤧𞤵𞤱𞤢𞥄𞤲𞤢 +- 𞤼𞤵𞤼𞤢𞤱𞤢𞤤: ‮𞤄𞤮𞤼𞤧𞤵𞤱𞤢𞥄𞤲𞤢 ++ 𞤼𞤵𞤼𞤢𞤱𞤢𞤤 ++ 𞤼𞤵𞤼𞤢𞤱𞤢𞤤: 𞤄𞤮𞤼𞤧𞤵𞤱𞤢𞥄𞤲𞤢 + 𞤼𞤵𞤼𞤢𞤱𞤢𞤤 | 𞤼𞤵𞤼𞤢𞤱𞤢𞤤: 𞤄𞤫𞤤𞤢𞤪𞤵𞥅𞤧 + 𞤼𞤵𞤼𞤢𞤱𞤢𞤤: 𞤄𞤫𞤤𞤢𞤪𞤵𞥅𞤧 + 𞤼𞤵𞤼𞤢𞤱𞤢𞤤 | 𞤼𞤵𞤼𞤢𞤱𞤢𞤤: 𞤄𞤫𞤤𞤭𞥅𞥁 +diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/external/langtags.json b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/external/langtags.json +index bef998d..b915bbf 100644 +--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/external/langtags.json ++++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/external/langtags.json +@@ -46125,7 +46125,7 @@ + "iana": [ "Northern Hindko" ], + "iso639_3": "hno", + "latnnames": [ "Hindko" ], +- "localname": "ہندکو‬", ++ "localname": "ہندکو", + "localnames": [ "ہندکو" ], + "name": "Hindko, Northern", + "names": [ "Hazara Hindko", "Hindko", "Kagani", "Kaghani", "Northern Hindko" ], +-- +2.46.0 + diff --git a/cldr-emoji-annotation.spec b/cldr-emoji-annotation.spec index 7db3180..75b6da4 100644 --- a/cldr-emoji-annotation.spec +++ b/cldr-emoji-annotation.spec @@ -19,6 +19,8 @@ Source0: https://github.com/unicode-org/cldr/releases/download/%{tag_version} Source0: https://github.com/unicode-org/cldr/archive/refs/tags/%{tag_version}.zip#/cldr-%{tag_version}.zip %endif #Patch0: %%{name}-HEAD.patch +# Fix osci.brew-build.rpminspect.static-analysis in 45-5.el10 +Patch1: %{name}-rhel56890-forbidden-0x202e.patch BuildRequires: autoconf BuildRequires: automake BuildArch: noarch @@ -49,9 +51,9 @@ when building programs that use cldr-emoji-annotations. %prep %if %is_official -%autosetup -c -n cldr-%{tag_version} +%autosetup -c -n cldr-%{tag_version} -p1 %else -%autosetup -n cldr-%{tag_version} +%autosetup -n cldr-%{tag_version} -p1 %endif