From 77fb0431b2b38c720003a82fb5f9a265d3d1d776 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 18 Dec 2020 11:38:25 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/cldr-emoji-annotation.git#8a8b2ef93301f4527660a51f85ed63418d19d7bd --- .gitignore | 1 + cldr-emoji-annotation.spec | 20 ++++++++++++-------- sources | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 29b3f55..d9f8321 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /cldr-release-38-beta2.tar.gz /cldr-release-38-beta3.tar.gz /cldr-common-38.0.zip +/cldr-release-38-1.zip diff --git a/cldr-emoji-annotation.spec b/cldr-emoji-annotation.spec index 42e9c87..1b4a0aa 100644 --- a/cldr-emoji-annotation.spec +++ b/cldr-emoji-annotation.spec @@ -1,9 +1,10 @@ -%global file_version release-38 -%global is_official 0%(echo %{file_version} | egrep -q 'alpha|beta|final'; echo $?) +%global tag_version release-38-1 +#%%global is_official 0%%(echo %%{tag_version} | egrep -q 'alpha|beta|final'; echo $?) +%global is_official 0 Name: cldr-emoji-annotation Version: 38 -Release: 1%{?dist} +Release: 1.1%{?dist} %if 0%{?fedora:1}%{?rhel:0} Epoch: 1 %endif @@ -12,10 +13,10 @@ Summary: Emoji annotation files in CLDR License: Unicode URL: https://unicode.org/cldr %if %is_official -Source0: https://github.com/unicode-org/cldr/releases/download/%{file_version}/cldr-common-%{version}.0.zip -Source1: https://raw.githubusercontent.com/unicode-org/cldr/%{file_version}/README.md#/cldr-README.md +Source0: https://github.com/unicode-org/cldr/releases/download/%{tag_version}/cldr-common-%{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/%{file_version}.zip#/cldr-%{file_version}.zip +Source0: https://github.com/unicode-org/cldr/archive/%{tag_version}.zip#/cldr-%{tag_version}.zip %endif #Patch0: %%{name}-HEAD.patch BuildRequires: autoconf @@ -48,10 +49,10 @@ when building programs that use cldr-emoji-annotations. %prep %if %is_official -%autosetup -c -n cldr-%{file_version} +%autosetup -c -n cldr-%{tag_version} cp %SOURCE1 README.md %else -%autosetup -n cldr-%{file_version} +%autosetup -n cldr-%{tag_version} %endif @@ -121,6 +122,9 @@ done %{_datadir}/pkgconfig/*.pc %changelog +* Fri Dec 18 2020 Takao Fujiwara - 1:38-1.1 +- Bump to release-38-1 + * Sun Nov 01 2020 Takao Fujiwara - 1:38-1 - Bump release-38 diff --git a/sources b/sources index 1da0fff..4cdf9ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cldr-common-38.0.zip) = 76a2cdfbe74bd25825dd0a91f81d3651d6baab374b7cffd2346d9194b30d2bf16940e448ede5b1c5f470ad2ff7df082a957ec6eade336b9baaafd40870648b1e +SHA512 (cldr-release-38-1.zip) = 6f4a9f179e71e61ad843fc54c98a324dbb2b95b91b30ba78b836cdeba61505a75a5dda8b31c8ad2a17d9fdba16720f6e5ad9dc720b586e5cf2a2b464e394367a