From cb9c0e2f3a959d7e71b13ac7a97e62811d35005a Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 18:42:45 +0100 Subject: [PATCH] update to 2020_09_16_unicode13.1 fix 66-noto-color-emoji.conf (replace append with append_last) to fix bad rendering with DejaVu fonts seend on Firefox [release 2020_09_16_unicode13.1-1mamba;Wed Mar 10 2021] --- 66-noto-color-emoji.conf | 2 +- ttf-noto-emoji.spec | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/66-noto-color-emoji.conf b/66-noto-color-emoji.conf index 4f7c74c..1911b4b 100644 --- a/66-noto-color-emoji.conf +++ b/66-noto-color-emoji.conf @@ -20,7 +20,7 @@ Set Noto Color Emoji as fallback for Noto family Noto - + Noto Color Emoji diff --git a/ttf-noto-emoji.spec b/ttf-noto-emoji.spec index fc85b6c..7b14388 100644 --- a/ttf-noto-emoji.spec +++ b/ttf-noto-emoji.spec @@ -1,6 +1,6 @@ -%define gitver %(echo %version | tr _ -) +%define gitver %(echo %version | tr _ - | tr . _) Name: ttf-noto-emoji -Version: 2019_11_19_unicode12 +Version: 2020_09_16_unicode13.1 Release: 1mamba Summary: Google Noto emoji fonts Group: System/Fonts @@ -8,14 +8,12 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://github.com/googlefonts/noto-emoji.git -## GITSOURCE https://github.com/googlefonts/noto-emoji.git v2019-11-19-unicode12 Source: https://github.com/googlefonts/noto-emoji.git/v%{gitver}/noto-emoji-%{version}.tar.bz2 Source1: 66-noto-color-emoji.conf License: OFL ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END Requires(post): fontconfig -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Google Noto emoji fonts. @@ -28,11 +26,19 @@ Google Noto emoji fonts. %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" install -D -m644 fonts/NotoColorEmoji.ttf %{buildroot}%{_datadir}/fonts/truetype/NotoColorEmoji.ttf -install -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/fonts/conf.d/66-noto-color-emoji.conf +install -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/fonts/conf.avail/66-noto-color-emoji.conf +install -d -m0755 %{buildroot}%{_sysconfdir}/fonts/conf.d +ln -s ../conf.avail/66-noto-color-emoji.conf %{buildroot}%{_sysconfdir}/fonts/conf.d/66-noto-color-emoji.conf %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" +%pre +if [ $1 -gt 1 ]; then +[ -L %{_sysconfdir}/fonts/conf.d/66-noto-color-emoji.conf ] || rm -f %{_sysconfdir}/fonts/conf.d/66-noto-color-emoji.conf +fi +: + %post [ -x %{_bindir}/fc-cache ] && %{_bindir}/fc-cache : @@ -43,10 +49,15 @@ install -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/fonts/conf.d/66-noto-colo %files %defattr(-,root,root) +%{_sysconfdir}/fonts/conf.avail/66-noto-color-emoji.conf %{_sysconfdir}/fonts/conf.d/66-noto-color-emoji.conf %{_datadir}/fonts/truetype/NotoColorEmoji.ttf %doc AUTHORS LICENSE %changelog +* Wed Mar 10 2021 Silvan Calarco 2020_09_16_unicode13.1-1mamba +- update to 2020_09_16_unicode13.1 +- fix 66-noto-color-emoji.conf (replace append with append_last) to fix bad rendering with DejaVu fonts seend on Firefox + * Mon Apr 06 2020 Silvan Calarco 2019_11_19_unicode12-1mamba - package created using the webbuild interface