From f3f953c752eed55141219f45dd9adeb00c648928 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 29 Nov 2024 09:40:46 +0300 Subject: [PATCH] import cldr-emoji-annotation-46-1.el10 --- .cldr-emoji-annotation.metadata | 2 +- .gitignore | 2 +- ...nnotation-rhel56890-forbidden-0x202e.patch | 42 ------------------- SPECS/cldr-emoji-annotation.spec | 14 ++++--- 4 files changed, 11 insertions(+), 49 deletions(-) delete mode 100644 SOURCES/cldr-emoji-annotation-rhel56890-forbidden-0x202e.patch diff --git a/.cldr-emoji-annotation.metadata b/.cldr-emoji-annotation.metadata index b4150e0..a7c03bc 100644 --- a/.cldr-emoji-annotation.metadata +++ b/.cldr-emoji-annotation.metadata @@ -1 +1 @@ -07efb388ee2074814591b6c390f18f0d64acdd8a SOURCES/cldr-release-45.zip +f5652b633baac6a8a5d4e79f6aebb891f39cee30 SOURCES/cldr-release-46.zip diff --git a/.gitignore b/.gitignore index b1d26bb..f9fab96 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cldr-release-45.zip +SOURCES/cldr-release-46.zip diff --git a/SOURCES/cldr-emoji-annotation-rhel56890-forbidden-0x202e.patch b/SOURCES/cldr-emoji-annotation-rhel56890-forbidden-0x202e.patch deleted file mode 100644 index 83d7ac0..0000000 --- a/SOURCES/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/SPECS/cldr-emoji-annotation.spec b/SPECS/cldr-emoji-annotation.spec index a034ac3..cbfc438 100644 --- a/SPECS/cldr-emoji-annotation.spec +++ b/SPECS/cldr-emoji-annotation.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.6.5) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 6; + release_number = 1; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -14,7 +14,7 @@ %global is_official 0 Name: cldr-emoji-annotation -Version: 45 +Version: 46 Release: %autorelease %if 0%{?fedora:1}%{?rhel:0} Epoch: 1 @@ -29,8 +29,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 @@ -138,10 +136,16 @@ done %{_datadir}/pkgconfig/*.pc %changelog +## START: Generated by rpmautospec +* Thu Nov 07 2024 Takao Fujiwara - 46-1 +- Bump to release-46 + +* Tue Oct 29 2024 Troy Dawson - 45-7 +- Bump release for October 2024 mass rebuild: + * Fri Oct 25 2024 MSVSphere Packaging Team - 45-6 - Rebuilt for MSVSphere 10 -## START: Generated by rpmautospec * Mon Sep 16 2024 Takao Fujiwara - 45-6 - Fix a forbidden code point, 0x202E