freeworld build does not need fonts

epel8
Tom Callaway 6 years ago
parent a367efa147
commit cf170d6fd1

@ -145,7 +145,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel} Name: chromium%{chromium_channel}
%endif %endif
Version: %{majorversion}.0.3497.100 Version: %{majorversion}.0.3497.100
Release: 1%{?dist} Release: 2%{?dist}
Summary: A WebKit (Blink) powered web browser Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@ -477,6 +477,9 @@ BuildRequires: pkgconfig(gnome-keyring-1)
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: systemd BuildRequires: systemd
# for third_party/test_fonts # for third_party/test_fonts
%if %{freeworld}
# dont need fonts for this
%else
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
Source100: https://github.com/google/fonts/blob/master/apache/arimo/Arimo-Bold.ttf Source100: https://github.com/google/fonts/blob/master/apache/arimo/Arimo-Bold.ttf
Source101: https://github.com/google/fonts/blob/master/apache/arimo/Arimo-BoldItalic.ttf Source101: https://github.com/google/fonts/blob/master/apache/arimo/Arimo-BoldItalic.ttf
@ -504,6 +507,7 @@ BuildRequires: thai-scalable-garuda-fonts
BuildRequires: lohit-devanagari-fonts BuildRequires: lohit-devanagari-fonts
BuildRequires: lohit-tamil-fonts BuildRequires: lohit-tamil-fonts
BuildRequires: google-noto-sans-khmer-fonts BuildRequires: google-noto-sans-khmer-fonts
%endif
# using the built from source version on aarch64 # using the built from source version on aarch64
BuildRequires: ninja-build BuildRequires: ninja-build
@ -926,6 +930,9 @@ popd
%endif %endif
# Unpack fonts # Unpack fonts
%if %{freeworld}
# no font fun needed.
%else
pushd third_party/test_fonts pushd third_party/test_fonts
mkdir test_fonts mkdir test_fonts
cd test_fonts cd test_fonts
@ -965,6 +972,7 @@ cp -a /usr/share/fonts/thai-scalable/Garuda.ttf .
cp -a /usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf /usr/share/fonts/lohit-tamil/Lohit-Tamil.ttf . cp -a /usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf /usr/share/fonts/lohit-tamil/Lohit-Tamil.ttf .
cp -a /usr/share/fonts/google-noto/NotoSansKhmer-Regular.ttf . cp -a /usr/share/fonts/google-noto/NotoSansKhmer-Regular.ttf .
popd popd
%endif
# Core defines are flags that are true for both the browser and headless. # Core defines are flags that are true for both the browser and headless.
CHROMIUM_CORE_GN_DEFINES="" CHROMIUM_CORE_GN_DEFINES=""
@ -1764,6 +1772,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog %changelog
* Tue Oct 16 2018 Tom Callaway <spot@fedoraproject.org> - 69.0.3497.100-2
- do not play with fonts on freeworld builds
* Thu Oct 4 2018 Tom Callaway <spot@fedoraproject.org> - 69.0.3497.100-1 * Thu Oct 4 2018 Tom Callaway <spot@fedoraproject.org> - 69.0.3497.100-1
- update to 69.0.3497.100 - update to 69.0.3497.100

Loading…
Cancel
Save