commit
5e3ea0facb
@ -0,0 +1 @@
|
||||
07efb388ee2074814591b6c390f18f0d64acdd8a SOURCES/cldr-release-45.zip
|
@ -0,0 +1 @@
|
||||
SOURCES/cldr-release-45.zip
|
@ -0,0 +1,42 @@
|
||||
From 71b43c994147390e76fa3b1fa7af2f3aa7afa2d2 Mon Sep 17 00:00:00 2001
|
||||
From: Takao Fujiwara <tfujiwar@redhat.com>
|
||||
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
|
||||
<annotation cp="🇧🇹" type="tts">𞤼𞤵𞤼𞤢𞤱𞤢𞤤: 𞤄𞤵𞥅𞤼𞤢𞥄𞤲</annotation>
|
||||
<annotation cp="🇧🇻">𞤼𞤵𞤼𞤢𞤱𞤢𞤤 | 𞤼𞤵𞤼𞤢𞤱𞤢𞤤: 𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤄𞤵𞥅𞤾𞤫𞥅</annotation>
|
||||
<annotation cp="🇧🇻" type="tts">𞤼𞤵𞤼𞤢𞤱𞤢𞤤: 𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤄𞤵𞥅𞤾𞤫𞥅</annotation>
|
||||
- <annotation cp="🇧🇼">𞤼𞤵𞤼𞤢𞤱𞤢𞤤 | 𞤼𞤵𞤼𞤢𞤱𞤢𞤤: 𞤄𞤮𞤼𞤧𞤵𞤱𞤢𞥄𞤲𞤢</annotation>
|
||||
- <annotation cp="🇧🇼" type="tts">𞤼𞤵𞤼𞤢𞤱𞤢𞤤: 𞤄𞤮𞤼𞤧𞤵𞤱𞤢𞥄𞤲𞤢</annotation>
|
||||
+ <annotation cp="🇧🇼">𞤼𞤵𞤼𞤢𞤱𞤢𞤤</annotation>
|
||||
+ <annotation cp="🇧🇼" type="tts">𞤼𞤵𞤼𞤢𞤱𞤢𞤤: 𞤄𞤮𞤼𞤧𞤵𞤱𞤢𞥄𞤲𞤢</annotation>
|
||||
<annotation cp="🇧🇾">𞤼𞤵𞤼𞤢𞤱𞤢𞤤 | 𞤼𞤵𞤼𞤢𞤱𞤢𞤤: 𞤄𞤫𞤤𞤢𞤪𞤵𞥅𞤧</annotation>
|
||||
<annotation cp="🇧🇾" type="tts">𞤼𞤵𞤼𞤢𞤱𞤢𞤤: 𞤄𞤫𞤤𞤢𞤪𞤵𞥅𞤧</annotation>
|
||||
<annotation cp="🇧🇿">𞤼𞤵𞤼𞤢𞤱𞤢𞤤 | 𞤼𞤵𞤼𞤢𞤱𞤢𞤤: 𞤄𞤫𞤤𞤭𞥅𞥁</annotation>
|
||||
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
|
||||
|
@ -0,0 +1,147 @@
|
||||
## START: Set by rpmautospec
|
||||
## (rpmautospec version 0.6.5)
|
||||
## RPMAUTOSPEC: autorelease, autochangelog
|
||||
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
|
||||
release_number = 6;
|
||||
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
|
||||
print(release_number + base_release_number - 1);
|
||||
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
|
||||
## END: Set by rpmautospec
|
||||
|
||||
%global tag_version release-%%(echo "%version" | tr '~' '-')
|
||||
#%%global is_official 0%%(echo %%{tag_version} | grep -qE 'alpha|beta|final'; echo $?)
|
||||
#%%global is_official 0
|
||||
%global is_official 0
|
||||
|
||||
Name: cldr-emoji-annotation
|
||||
Version: 45
|
||||
Release: %autorelease
|
||||
%if 0%{?fedora:1}%{?rhel:0}
|
||||
Epoch: 1
|
||||
%endif
|
||||
# Annotation files are in Unicode license
|
||||
Summary: Emoji annotation files in CLDR
|
||||
License: Unicode-DFS-2016
|
||||
URL: https://unicode.org/cldr
|
||||
%if %is_official
|
||||
Source0: https://github.com/unicode-org/cldr/releases/download/%{tag_version}/cldr-core-%{version}.zip
|
||||
%else
|
||||
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
|
||||
Requires: %{name}-dtd
|
||||
|
||||
%description
|
||||
This package provides the emoji annotation file by language in CLDR.
|
||||
|
||||
%package dtd
|
||||
Summary: DTD files of CLDR common
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description dtd
|
||||
This package contains DTD files of CLDR common which are required by
|
||||
cldr-emoji-annotations.
|
||||
|
||||
%package devel
|
||||
Summary: Files for development using cldr-annotations
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
BuildArch: noarch
|
||||
|
||||
%description devel
|
||||
This package contains the pkg-config files for development
|
||||
when building programs that use cldr-emoji-annotations.
|
||||
|
||||
|
||||
%prep
|
||||
%if %is_official
|
||||
%autosetup -c -n cldr-%{tag_version} -p1
|
||||
%else
|
||||
%autosetup -n cldr-%{tag_version} -p1
|
||||
%endif
|
||||
|
||||
|
||||
%install
|
||||
pushd $PWD
|
||||
ANNOTATION_DIR=common/annotations
|
||||
CLDR_DIR=%{_datadir}/unicode/cldr/$ANNOTATION_DIR
|
||||
pushd $ANNOTATION_DIR
|
||||
for xml in *.xml ; do
|
||||
install -pm 644 -D $xml $RPM_BUILD_ROOT$CLDR_DIR/$xml
|
||||
done
|
||||
popd
|
||||
|
||||
ANNOTATION_DIR=common/annotationsDerived
|
||||
CLDR_DIR=%{_datadir}/unicode/cldr/$ANNOTATION_DIR
|
||||
pushd $ANNOTATION_DIR
|
||||
for xml in *.xml ; do
|
||||
install -pm 644 -D $xml $RPM_BUILD_ROOT$CLDR_DIR/$xml
|
||||
done
|
||||
popd
|
||||
|
||||
DTD_DIR=common/dtd
|
||||
CLDR_DIR=%{_datadir}/unicode/cldr/$DTD_DIR
|
||||
pushd $DTD_DIR
|
||||
for dtd in *.dtd ; do
|
||||
install -pm 644 -D $dtd $RPM_BUILD_ROOT$CLDR_DIR/$dtd
|
||||
done
|
||||
popd
|
||||
|
||||
install -pm 755 -d $RPM_BUILD_ROOT%{_datadir}/pkgconfig
|
||||
cat >> $RPM_BUILD_ROOT%{_datadir}/pkgconfig/%{name}.pc <<_EOF
|
||||
prefix=/usr
|
||||
|
||||
Name: cldr-emoji-annotations
|
||||
Description: annotation files in CLDR
|
||||
Version: %{version}
|
||||
_EOF
|
||||
|
||||
|
||||
%check
|
||||
ANNOTATION_DIR=common/annotations
|
||||
CLDR_DIR=%{_datadir}/unicode/cldr/$ANNOTATION_DIR
|
||||
for xml in $ANNOTATION_DIR/*.xml ; do
|
||||
xmllint --noout --valid --postvalid $xml
|
||||
done
|
||||
|
||||
ANNOTATION_DIR=common/annotationsDerived
|
||||
CLDR_DIR=%{_datadir}/unicode/cldr/$ANNOTATION_DIR
|
||||
for xml in $ANNOTATION_DIR/*.xml ; do
|
||||
xmllint --noout --valid --postvalid $xml
|
||||
done
|
||||
|
||||
|
||||
%files
|
||||
%if %is_official
|
||||
%doc README-common.md
|
||||
%license LICENSE.txt
|
||||
%else
|
||||
%doc README.md
|
||||
%license LICENSE
|
||||
%endif
|
||||
%{_datadir}/unicode/cldr/common/annotations
|
||||
%{_datadir}/unicode/cldr/common/annotationsDerived
|
||||
|
||||
%files dtd
|
||||
%dir %{_datadir}/unicode
|
||||
%dir %{_datadir}/unicode/cldr
|
||||
%dir %{_datadir}/unicode/cldr/common
|
||||
%{_datadir}/unicode/cldr/common/dtd
|
||||
|
||||
%files devel
|
||||
%{_datadir}/pkgconfig/*.pc
|
||||
|
||||
%changelog
|
||||
## START: Generated by rpmautospec
|
||||
* Mon Sep 16 2024 Takao Fujiwara <tfujiwar@redhat.com> - 45-6
|
||||
- Fix a forbidden code point, 0x202E
|
||||
|
||||
* Sun Sep 01 2024 Takao Fujiwara <tfujiwar@redhat.com> - 45-5
|
||||
- RPMAUTOSPEC: unresolvable merge
|
||||
## END: Generated by rpmautospec
|
Loading…
Reference in new issue