diff --git a/.gitignore b/.gitignore index f8a2341..ba67bff 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /cldr-release-45-alpha3.zip /cldr-release-45-beta3.zip /cldr-release-45.zip +/cldr-release-46.zip diff --git a/cldr-emoji-annotation-rhel56890-forbidden-0x202e.patch b/cldr-emoji-annotation-rhel56890-forbidden-0x202e.patch deleted file mode 100644 index 83d7ac0..0000000 --- a/cldr-emoji-annotation-rhel56890-forbidden-0x202e.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 75b6da4..070b0c9 100644 --- a/cldr-emoji-annotation.spec +++ b/cldr-emoji-annotation.spec @@ -4,7 +4,7 @@ %global is_official 0 Name: cldr-emoji-annotation -Version: 45 +Version: 46 Release: %autorelease %if 0%{?fedora:1}%{?rhel:0} Epoch: 1 @@ -19,8 +19,6 @@ 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 diff --git a/sources b/sources index c4f6bd5..91b17e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cldr-release-45.zip) = 0f8ddf06fbb0e78d96ff855b280b7af7210dcf5d2c631ba2c26ca30baf9457d4393248e03ea05131e8702bb50b66e075701b2cb6c1f1559f742de2ad8fdee0d6 +SHA512 (cldr-release-46.zip) = 2d3f84f347dfc025b4a5b7689d94e3f40a32f78f8c1de72fc60dd61ca9a5e81fcc090a7ed5f6182d66e9f3168abcd5d09d4579cc02989c573b199d7ee667b9f1