rpms
/
chromium
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use system fontconfig (except on epel7)

This commit is contained in:
Tom Callaway 2018-04-17 12:54:51 -04:00
parent 11492d0030
commit e00e15df7e
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
chromium.spec
View File

@ -91,6 +91,7 @@ BuildRequires: libicu-devel >= 5.4
%global bundlelibjpeg 1 %global bundlelibjpeg 1
%global bundlefreetype 1 %global bundlefreetype 1
%global bundlelibdrm 1 %global bundlelibdrm 1
%global bundlefontconfig 1
%else %else
%global bundleharfbuzz 0 %global bundleharfbuzz 0
%global bundleopus 1 %global bundleopus 1
@ -100,6 +101,7 @@ BuildRequires: libicu-devel >= 5.4
%global bundlelibjpeg 0 %global bundlelibjpeg 0
%global bundlefreetype 0 %global bundlefreetype 0
%global bundlelibdrm 0 %global bundlelibdrm 0
%global bundlefontconfig 0
%endif %endif
# Needs at least harfbuzz 1.7.3 now. # Needs at least harfbuzz 1.7.3 now.
@ -134,7 +136,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel} Name: chromium%{chromium_channel}
%endif %endif
Version: %{majorversion}.0.3325.181 Version: %{majorversion}.0.3325.181
Release: 2%{?dist} Release: 3%{?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)
@ -502,7 +504,9 @@ Provides: bundled(fdmlibm) = 5.3
# Don't get too excited. MPEG and other legally problematic stuff is stripped out. # Don't get too excited. MPEG and other legally problematic stuff is stripped out.
Provides: bundled(ffmpeg) = 3.2git Provides: bundled(ffmpeg) = 3.2git
Provides: bundled(fips181) = 2.2.3 Provides: bundled(fips181) = 2.2.3
Provides: bundled(fontconfig) = 2.11.0 %if 0%{?bundlefontconfig}
Provides: bundled(fontconfig) = 2.12.6
%endif
%if 0%{?bundlefreetype} %if 0%{?bundlefreetype}
Provides: bundled(freetype) = 2.9.3 Provides: bundled(freetype) = 2.9.3
%endif %endif
@ -1079,6 +1083,10 @@ export PATH=$PATH:%{_builddir}/depot_tools
build/linux/unbundle/replace_gn_files.py --system-libraries \ build/linux/unbundle/replace_gn_files.py --system-libraries \
flac \ flac \
%if 0%{?bundlefontconfig}
%else
fontconfig \
%endif
%if 0%{?bundlefreetype} %if 0%{?bundlefreetype}
%else %else
freetype \ freetype \
@ -1617,6 +1625,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog %changelog
* Tue Apr 17 2018 Tom Callaway <spot@fedoraproject.org> 65.0.3325.181-3
- use system fontconfig (except on epel7)
* Wed Apr 4 2018 Tom Callaway <spot@fedoraproject.org> 65.0.3325.181-2 * Wed Apr 4 2018 Tom Callaway <spot@fedoraproject.org> 65.0.3325.181-2
- add explicit dependency on minizip (bz 1534282) - add explicit dependency on minizip (bz 1534282)