diff --git a/langpacks.spec b/langpacks.spec index d99543a..0a35b18 100644 --- a/langpacks.spec +++ b/langpacks.spec @@ -1,6 +1,6 @@ Name: langpacks Version: 3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Langpacks meta-package License: GPLv2+ @@ -53,6 +53,10 @@ This package provides %{langname} core langpacks packages.\ Summary: %{langname} core font meta-package\ %{-f:Requires: %{-f*}}%{!-f:Requires: dejavu-sans-fonts} \ %{-l:Provides: font(:lang=%{lowerortho})} \ +%if "%{lowerortho}" != "%{fontpkgcode}"\ +Provides: langpacks-core-font-%{lowerortho} = %{version}-%{release} \ +Obsoletes: langpacks-core-font-%{lowerortho} < %{version}-%{release} \ +%endif \ \ %description core-font-%{fontpkgcode}\ This package defines the default font for %{langname} language.\ @@ -1276,6 +1280,9 @@ DESTDIR=%{buildroot} appstream-util split-appstream %{SOURCE1} DESTDIR=%{buildroot} appstream-util split-appstream %{SOURCE2} %changelog +* Wed Mar 11 2020 Akira TAGOH - 3.0-3 +- Stop shipping core-font sub-packages in lowercase and keep same naming as others. + * Tue Feb 4 2020 Akira TAGOH - 3.0-2 - Revert font(familyname) dependency to fix some regressions. diff --git a/normlang.py b/normlang.py index 7078a26..38de6ce 100644 --- a/normlang.py +++ b/normlang.py @@ -4,4 +4,4 @@ import sys fontconfig = ctypes.CDLL("libfontconfig.so.1") fontconfig.FcLangNormalize.argtypes = [ctypes.c_char_p] fontconfig.FcLangNormalize.restype = ctypes.c_char_p -print(fontconfig.FcLangNormalize(sys.argv[1].encode('utf-8')).decode('utf-8').lower()) +print(fontconfig.FcLangNormalize(sys.argv[1].encode('utf-8')).decode('utf-8')) diff --git a/org.fedoraproject.LangPacks-Core-Font.xml b/org.fedoraproject.LangPacks-Core-Font.xml index 7894345..e7bd4e9 100644 --- a/org.fedoraproject.LangPacks-Core-Font.xml +++ b/org.fedoraproject.LangPacks-Core-Font.xml @@ -916,7 +916,7 @@ CC0-1.0 - org.fedoraproject.LangPack-Core-Font-zh_cn + org.fedoraproject.LangPack-Core-Font-zh_CN Simplified Chinese Localization Font support for Simplified Chinese @@ -927,7 +927,7 @@ CC0-1.0 - org.fedoraproject.LangPack-Core-Font-zh_tw + org.fedoraproject.LangPack-Core-Font-zh_TW Traditional Chinese Localization Font support for Traditional Chinese