From 454f1f55c72f095ac66c5a11bbbe415a7dcf4322 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Dec 14 2008 23:30:29 +0000 Subject: - No longer ship Wesnoth's redundant copy of fonts. We now symlink to the Fedora packaged fonts that wesnoth expects. dejavu-fonts (Latin) sazanami-fonts-gothic (Japanese) wqy-zenhei-fonts (Chinese) We do not explicitly require these fonts. Normally these fonts would be already installed by your system use that language. --- diff --git a/wesnoth.spec b/wesnoth.spec index 3c4e468..f35e601 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.4.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Turn-based strategy game with a fantasy theme Group: Amusements/Games @@ -14,6 +14,7 @@ Patch1: wesnoth-1.3.16-remove-ogg-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: wesnoth-data = %{version} +Requires: dejavu-fonts BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel BuildRequires: SDL_net-devel @@ -119,6 +120,15 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps ln -sf ../wesnoth/icons/%{name}-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps ln -sf ../wesnoth/icons/%{name}_editor-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps +# Wesnoth ships its own fonts, replace with Fedora packaged versions +rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/fonts/* +# dejavu-fonts +ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT/%{_datadir}/%{name}/fonts/DejaVuSans.ttf +# sazanami-fonts-gothic +ln -s /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf $RPM_BUILD_ROOT/%{_datadir}/%{name}/fonts/sazanami-gothic.ttf +# wqy-zenhei-fonts +ln -s /usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc $RPM_BUILD_ROOT/%{_datadir}/%{name}/fonts/wqy-zenhei-gb2312.ttf + %find_lang %{name}.\* @@ -233,6 +243,15 @@ fi %endif %changelog +* Sun Dec 14 2008 Warren Togami - 1.4.6-5 +- No longer ship Wesnoth's redundant copy of fonts. + We now symlink to the Fedora packaged fonts that wesnoth expects. + dejavu-fonts (Latin) + sazanami-fonts-gothic (Japanese) + wqy-zenhei-fonts (Chinese) + We do not explicitly require these fonts. Normally these fonts would be + already installed by your system use that language. + * Wed Dec 10 2008 Jon Ciesla - 1.4.6-4 - Rediffed fuzzy gcc43 patch.