.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -7,4 +7,49 @@
 /cldr-emoji-annotation-33.0.0_1.tar.gz
 /cldr-emoji-annotation-33.0.0_2.tar.gz
 /cldr-emoji-annotation-33.1.0_0.tar.gz
+/cldr-emoji-annotation-34.12.14891_0.tar.gz
+/cldr-emoji-annotation-35.12.14971_0.tar.gz
+/cldr-emoji-annotation-36.12.120191002_0.tar.gz
+/cldr-emoji-annotation-36.12.120200305_0.tar.gz
+/cldr-emoji-annotation-37.0_13.0_0_1.tar.gz
+/cldr-emoji-annotation-37.0_13.0_0_2.tar.gz
+/cldr-emoji-annotation-38-alpha1.0_13.0_0_1.tar.gz
+/release-38-beta.tar.gz
+/cldr-release-38-beta.tar.gz
+/cldr-release-38-beta2.tar.gz
+/cldr-release-38-beta3.tar.gz
+/cldr-common-38.0.zip
+/cldr-release-38-1.zip
+/cldr-release-39-alpha0.zip
+/cldr-release-39-alpha1.zip
+/cldr-release-39-alpha4.zip
+/cldr-release-39-beta.zip
+/cldr-release-39-beta2.zip
 /cldr-release-39.zip
+/cldr-release-40-alpha1.zip
+/cldr-release-40-alpha2.zip
+/cldr-release-40-beta2.zip
+/cldr-release-40.zip
+/cldr-common-40.0.zip
+/cldr-release-41-alpha1.zip
+/cldr-release-41-alpha4.zip
+/cldr-release-41-beta1.zip
+/cldr-release-41.zip
+/cldr-release-42-alpha1.zip
+/cldr-release-42-alpha2.zip
+/cldr-release-42-beta3.zip
+/cldr-release-42.zip
+/cldr-release-43-alpha2.zip
+/cldr-release-43-beta2.zip
+/cldr-release-43-beta5.zip
+/cldr-core-43.zip
+/cldr-release-43-1.zip
+/cldr-release-44-alpha3.zip
+/cldr-release-44-beta2.zip
+/cldr-release-44.zip
+/cldr-release-44-1.zip
+/cldr-release-45-alpha0.zip
+/cldr-release-45-alpha3.zip
+/cldr-release-45-beta3.zip
+/cldr-release-45.zip
+/cldr-release-46.zip

changelog

@@ -0,0 +1,209 @@
+* Thu Mar 14 2024 Takao Fujiwara <tfujiwar@gmail.com> - 1:45~alpha3-1
+- Bump to release-45-alpha3
+
+* Mon Feb 12 2024 Takao Fujiwara <tfujiwar@gmail.com> - 1:45~alpha0-1
+- Bump to release-45-alpha0
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:44.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:44.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Dec 14 2023 Takao Fujiwara <tfujiwar@gmail.com> - 1:44.1
+- Bump to release-44-1
+
+* Tue Oct 31 2023 Takao Fujiwara <tfujiwar@gmail.com> - 1:44
+- Bump to release-44
+
+* Wed Oct 04 2023 Takao Fujiwara <tfujiwar@gmail.com> - 1:44~beta2-1
+- Bump to release-44-beta2
+
+* Fri Sep 15 2023 Takao Fujiwara <tfujiwar@gmail.com> - 1:44~alpha3-2
+- Bump to release-44-alpha3
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:43.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jun 20 2023 Takao Fujiwara <tfujiwar@gmail.com> - 1:43.1-1
+- Bump to release-43-1
+
+* Thu Apr 13 2023 Takao Fujiwara <tfujiwar@gmail.com> - 1:43-1
+- Bump to release-43
+
+* Tue Apr 11 2023 Takao Fujiwara <tfujiwar@gmail.com> - 1:43~beta5-1
+- Bump to release-43-beta5
+
+* Mon Mar 20 2023 Takao Fujiwara <tfujiwar@gmail.com> - 1:43~beta2-1
+- Bump to release-43-beta2
+
+* Tue Feb 28 2023 Takao Fujiwara <tfujiwar@gmail.com> - 1:43~alpha2-1
+- Bump to release-43-alpha2
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:42-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Nov 16 2022 Takao Fujiwara <tfujiwar@gmail.com> - 1:42
+- Migrate license tag to SPDX
+- Bump to release-42
+
+* Thu Oct 06 2022 Takao Fujiwara <tfujiwar@gmail.com> - 1:42~beta3-1
+- Bump to release-42-beta3
+
+* Tue Aug 23 2022 Takao Fujiwara <tfujiwar@gmail.com> - 1:42~alpha2-1
+- Bump to release-42-alpha2
+
+* Thu Aug 04 2022 Takao Fujiwara <tfujiwar@gmail.com> - 1:42~alpha1-1
+- Bump to release-42-alpha1
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:41-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Apr 05 2022 Takao Fujiwara <tfujiwar@gmail.com> - 1:41
+- Bump to release-41
+
+* Fri Mar 11 2022 Takao Fujiwara <tfujiwar@gmail.com> - 1:41~beta1-1
+- Bump to release-41-beta1
+
+* Fri Mar 04 2022 Takao Fujiwara <tfujiwar@gmail.com> - 1:41~alpha4-1
+- Bump to release-41-alpha4
+
+* Tue Feb 15 2022 Takao Fujiwara <tfujiwar@gmail.com> - 1:41~alpha1-1
+- Bump to release-41-alpha1
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:40.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Oct 29 2021 Takao Fujiwara <tfujiwar@gmail.com> - 1:40.0-3
+- Use cldr-common-40.0.zip since DTD files are resolved
+
+* Fri Oct 29 2021 Takao Fujiwara <tfujiwar@gmail.com> - 1:40-2
+- Bump to release-40
+
+* Fri Oct 08 2021 Takao Fujiwara <tfujiwar@gmail.com> - 1:40~beta2-1
+- Bump to release-40-beta2
+
+* Thu Sep 02 2021 Takao Fujiwara <tfujiwar@gmail.com> - 1:40~alpha2-1
+- Bump to release-40-alpha2
+
+* Mon Aug 23 2021 Takao Fujiwara <tfujiwar@gmail.com> - 1:40~alpha1-1
+- Bump to release-40-alpha1
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:39-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Apr 09 2021 Takao Fujiwara <tfujiwar@gmail.com> - 1:39
+- Bump to release-39
+
+* Tue Apr 06 2021 Takao Fujiwara <tfujiwar@gmail.com> - 1:39~beta2-1
+- Bump to release-39-beta2
+
+* Thu Mar 25 2021 Takao Fujiwara <tfujiwar@gmail.com> - 1:39~beta-1
+- Bump to release-39-beta
+
+* Wed Mar 03 2021 Takao Fujiwara <tfujiwar@gmail.com> - 1:39~alpha4-1
+- Bump to release-39-alpha4
+
+* Wed Feb 17 2021 Takao Fujiwara <tfujiwar@gmail.com> - 1:39~alpha1-1
+- Bump to release-39-alpha1
+
+* Mon Feb 08 2021 Takao Fujiwara <tfujiwar@gmail.com> - 1:39~alpha0-1
+- Bump release-39-alpha0
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:38-2.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Dec 18 2020 Takao Fujiwara <tfujiwar@gmail.com> - 1:38-1.1
+- Bump to release-38-1
+
+* Sun Nov 01 2020 Takao Fujiwara <tfujiwar@gmail.com> - 1:38-1
+- Bump release-38
+
+* Thu Oct 22 2020 Takao Fujiwara <tfujiwar@gmail.com> - 1:38~beta3-1
+- Bump release-38-beta3
+
+* Wed Oct 14 2020 Takao Fujiwara <tfujiwar@gmail.com> - 1:38~beta2-1
+- Bump release-38-beta2
+
+* Mon Sep 28 2020 Takao Fujiwara <tfujiwar@gmail.com> - 1:38~beta-3
+- Fix #1882930 - Add Epoch in Requires
+
+* Fri Sep 25 2020 Takao Fujiwara <tfujiwar@gmail.com> - 1:38~beta-2
+- Fix typo in cldr-emoji-annotation.pc
+
+* Fri Sep 25 2020 Takao Fujiwara <tfujiwar@gmail.com> - 1:38~beta-1
+- Dump release-38-beta
+- Move source URL from github.com/fujiwarat/cldr-emoji-annotation
+  to https://github.com/unicode-org/cldr
+
+* Fri Sep 11 2020 Takao Fujiwara <tfujiwar@gmail.com> - 38.0_13.0_0_1~alpha1-1
+- Dump release-38-alpha1
+
+* Sat Aug 01 2020 Takao Fujiwara <tfujiwar@gmail.com> - 37.0_13.0_0_2-1
+- Add cldr-emoji-annotation-dtd sub package and make check
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 37.0_13.0_0_1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jun 26 2020 Takao Fujiwara <tfujiwar@gmail.com> - 37.0_13.0_0_1-1
+- Integrated Emoji 13.0 CLDR 37.0
+
+* Wed Apr 22 2020 Takao Fujiwara <tfujiwar@gmail.com> - 36.12.120200305_0-1
+- Integrated Emoji 12.1 CLDR 36.1
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 36.12.120191002_0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Oct 25 2019 Takao Fujiwara <tfujiwar@gmail.com> - 36.12.120191002_0-1
+- Integrated Emoji 12.1 CLDR 36
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 35.12.14971_0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Apr 04 2019 Takao Fujiwara <tfujiwar@gmail.com> - 35.12.14971_0-1
+- Integrated release-35
+
+* Tue Feb 26 2019 Takao Fujiwara <tfujiwar@gmail.com> - 34.12.14891_0-1
+- Integrated release-35-alpha2
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 33.1.0_0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 33.1.0_0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jul 05 2018 Takao Fujiwara <tfujiwar@gmail.com> - 33.1.0_0-1
+- Integrated release 33-1
+
+* Wed Jun 20 2018 Takao Fujiwara <tfujiwar@gmail.com> - 33.0.0_2-1
+- Changed COPYING
+
+* Thu Apr 12 2018 Takao Fujiwara <tfujiwar@gmail.com> - 33.0.0_1-1
+- Integrated release 33
+
+* Fri Mar 09 2018 Takao Fujiwara <tfujiwar@gmail.com> - 32.90.0_1-2
+- Removed gcc dependency
+
+* Wed Mar 07 2018 Takao Fujiwara <tfujiwar@gmail.com> - 32.90.0_1-1
+- Integrated release-33-alpha
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 32.0.0_1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Nov 30 2017 Takao Fujiwara <tfujiwar@gmail.com> - 32.0.0_1-1
+- Integrated release 32
+
+* Thu Sep 28 2017 Takao Fujiwara <tfujiwar@gmail.com> - 31.90.0_1-1
+- Integrated release-32-alpha
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 31.0.1_1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Apr 21 2017 Takao Fujiwara <tfujiwar@gmail.com> - 31.0.1_1-1
+- Integrated release-31.0.1
+
+* Wed Mar 22 2017 Takao Fujiwara <tfujiwar@gmail.com> - 31.0.0_1-1
+- Integrated release-31
+
+* Mon Mar 06 2017 Takao Fujiwara <tfujiwar@gmail.com> - 30.0.3_2-1
+- Initial implementation

cldr-emoji-annotation.spec

@@ -1,32 +1,41 @@
-%global tag_version release-39
+%global tag_version release-%%(echo "%version" | tr '~' '-')
-#%%global is_official 0%%(echo %%{tag_version} | egrep -q 'alpha|beta|final'; echo $?)
+#%%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:    39
+Version:    46
-Release:    2%{?dist}
+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
+License:    Unicode-DFS-2016
 URL:        https://unicode.org/cldr
 %if %is_official
-Source0:    https://github.com/unicode-org/cldr/releases/download/%{tag_version}/cldr-common-%{version}.zip
+Source0:    https://github.com/unicode-org/cldr/releases/download/%{tag_version}/cldr-core-%{version}.zip
-Source1:    https://raw.githubusercontent.com/unicode-org/cldr/%{tag_version}/README.md#/cldr-README.md
 %else
-Source0:    https://github.com/unicode-org/cldr/archive/%{tag_version}.zip#/cldr-%{tag_version}.zip
+Source0:    https://github.com/unicode-org/cldr/archive/refs/tags/%{tag_version}.zip#/cldr-%{tag_version}.zip
 %endif
 #Patch0:     %%{name}-HEAD.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}
@@ -40,10 +49,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
-cp %SOURCE1 README.md
 %else
-%autosetup -n cldr-%{tag_version}
+%autosetup -n cldr-%{tag_version} -p1
 %endif
 
 
@@ -98,57 +106,25 @@ done
 
 
 %files
-%doc README.md readme.html
+%if %is_official
-%license unicode-license.txt
+%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
-%{_datadir}/unicode/cldr/common/annotations
-%{_datadir}/unicode/cldr/common/annotationsDerived
 
 %files devel
 %{_datadir}/pkgconfig/*.pc
 
 %changelog
-* Mon Jun 14 2021 Takao Fujiwara <tfujiwar@gmail.com> - 39-2
+%autochangelog
-- Add gating.yaml. Related: rhbz#1897540
 
-* Mon May 24 2021 Takao Fujiwara <tfujiwar@gmail.com> - 39-1
-- Bump to release-39. Related: rhbz#1897540
-
-* Thu Jul 05 2018 Takao Fujiwara <tfujiwar@gmail.com> - 33.1.0_0-1
-- Integrated release 33-1
-
-* Wed Jun 20 2018 Takao Fujiwara <tfujiwar@gmail.com> - 33.0.0_2-1
-- Changed COPYING
-
-* Thu Apr 12 2018 Takao Fujiwara <tfujiwar@gmail.com> - 33.0.0_1-1
-- Integrated release 33
-
-* Fri Mar 09 2018 Takao Fujiwara <tfujiwar@gmail.com> - 32.90.0_1-2
-- Removed gcc dependency
-
-* Wed Mar 07 2018 Takao Fujiwara <tfujiwar@gmail.com> - 32.90.0_1-1
-- Integrated release-33-alpha
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 32.0.0_1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Nov 30 2017 Takao Fujiwara <tfujiwar@gmail.com> - 32.0.0_1-1
-- Integrated release 32
-
-* Thu Sep 28 2017 Takao Fujiwara <tfujiwar@gmail.com> - 31.90.0_1-1
-- Integrated release-32-alpha
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 31.0.1_1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Apr 21 2017 Takao Fujiwara <tfujiwar@gmail.com> - 31.0.1_1-1
-- Integrated release-31.0.1
-
-* Wed Mar 22 2017 Takao Fujiwara <tfujiwar@gmail.com> - 31.0.0_1-1
-- Integrated release-31
-
-* Mon Mar 06 2017 Takao Fujiwara <tfujiwar@gmail.com> - 30.0.3_2-1
-- Initial implementation

gating.yaml

@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-8
+  - rhel-10
 decision_context: osci_compose_gate
 rules:
   # this is the testcase identifier, which OSCI pipeline uses

plans/test.fmf

@@ -0,0 +1,5 @@
+summary: Basic smoke test
+discover:
+    how: fmf
+execute:
+    how: tmt

sources

@@ -1 +1 @@
-SHA512 (cldr-release-39.zip) = 69ac9239833786d4261406cfea6013540f40ed1bc6afc07b44001aec34281307d6e5a7b30c2db73815cfec44521d508203169faf86bc5072fd048b91369a34e9
+SHA512 (cldr-release-46.zip) = 2d3f84f347dfc025b4a5b7689d94e3f40a32f78f8c1de72fc60dd61ca9a5e81fcc090a7ed5f6182d66e9f3168abcd5d09d4579cc02989c573b199d7ee667b9f1

tests/runtest.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-for dir in annotations annotationsDerived; do
-    for xml in /usr/share/unicode/cldr/common/$dir/*.xml; do
-        echo xmllint --noout --valid --postvalid $xml
-        xmllint --noout --valid --postvalid $xml
-        if [ $? -ne 0 ] ; then
-            echo "ERROR"
-            exit 1
-        fi
-    done
-done
-

tests/tests.yml

@@ -1,16 +0,0 @@
-- hosts: localhost
-  vars:
-  - artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}"
-  tags:
-  - classic
-  remote_user: root
-  roles:
-  - role: standard-test-basic
-    required_packages:
-    - cldr-emoji-annotation
-    - libxml2
-    tests:
-    - runtest:
-        dir: .
-        run: ./runtest.sh
-

tests/validation/main.fmf

@@ -0,0 +1,6 @@
+summary: Lint check for annotation files
+test: ./test.sh
+framework: beakerlib
+require:
+    - cldr-emoji-annotation
+    - libxml2

tests/validation/test.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+FAILED=0
+for dir in annotations annotationsDerived; do
+    for xml in /usr/share/unicode/cldr/common/$dir/*.xml; do
+        echo xmllint --noout --valid --postvalid $xml
+        xmllint --noout --valid --postvalid $xml
+        if test $? -ne 0 ; then
+            FAILED=1
+            break
+        fi
+    done
+    if test $FAILED -ne 0 ; then
+        break
+    fi
+done
+
+rlJournalStart
+    rlPhaseStartTest
+        rlAssertEquals "lint result" $FAILED 0
+    rlPhaseEnd
+rlJournalEnd