summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormooninite <mike@cchtml.com>2014-06-09 06:54:24 -0500
committermooninite <mike@cchtml.com>2014-06-09 06:54:24 -0500
commitb3154eb2409f36635c416e0ee1533daff3b3822e (patch)
tree8b15ae933811316bb103e7fd8add6a5f3f625103
parentb7214051c41824b383e0121a7ff7ab2a737329a4 (diff)
parent346642fcdac45b44065d8f79e284df78f8642c13 (diff)
downloadxbmc-rpm-b3154eb2409f36635c416e0ee1533daff3b3822e.tar.gz
xbmc-rpm-b3154eb2409f36635c416e0ee1533daff3b3822e.tar.xz
xbmc-rpm-b3154eb2409f36635c416e0ee1533daff3b3822e.zip
Merge pull request #1 from mooninite/unbundle-roboto-fonts
Unbundle Roboto fonts (RFBZ #3256)
-rw-r--r--xbmc.spec11
1 files changed, 10 insertions, 1 deletions
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 <ktdreyer@ktdreyer.com> - 13.1-0.3.rc1
+- Unbundle Roboto fonts (RFBZ #3256). Thanks Mohamed El Morabity.
+
* Mon May 26 2014 Michael Cronenworth <mike@cchtml.com> - 13.1-0.2.rc1
- Update to 13.1 RC 1