From 346642fcdac45b44065d8f79e284df78f8642c13 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Wed, 28 May 2014 22:12:44 -0600 Subject: Unbundle Roboto fonts (RFBZ #3256) Thanks Mohamed El Morabity. --- xbmc.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xbmc.spec b/xbmc.spec index cce3112..1580ce1 100644 --- a/xbmc.spec +++ b/xbmc.spec @@ -7,7 +7,7 @@ Name: xbmc Version: 13.1 -Release: 0.2.rc1%{?dist} +Release: 0.3.rc1%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ @@ -87,6 +87,7 @@ BuildRequires: ffmpeg-devel BuildRequires: flac-devel BuildRequires: flex BuildRequires: fontconfig-devel +BuildRequires: fontpackages-devel BuildRequires: freetype-devel BuildRequires: fribidi-devel %if 0%{?el6} @@ -177,6 +178,7 @@ BuildRequires: zlib-devel # nfs-utils-lib-devel package currently broken #BuildRequires: nfs-utils-lib-devel +Requires: google-roboto-fonts # need explicit requires for these packages # as they are dynamically loaded via XBMC's arcane # pseudo-DLL loading scheme (sigh) @@ -340,6 +342,10 @@ ln -s %{python_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module #install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib #ln -s %{python_sitearch}/pysqlite2 $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2 +# Use external Roboto font files instead of bundled ones +ln -sf %{_fontbasedir}/google-roboto/Roboto-Regular.ttf ${RPM_BUILD_ROOT}%{_datadir}/xbmc/addons/skin.confluence/fonts/ +ln -sf %{_fontbasedir}/google-roboto/Roboto-Bold.ttf ${RPM_BUILD_ROOT}%{_datadir}/xbmc/addons/skin.confluence/fonts/ + %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -389,6 +395,9 @@ fi %changelog +* Thu May 29 2014 Ken Dreyer - 13.1-0.3.rc1 +- Unbundle Roboto fonts (RFBZ #3256). Thanks Mohamed El Morabity. + * Mon May 26 2014 Michael Cronenworth - 13.1-0.2.rc1 - Update to 13.1 RC 1 -- cgit