diff --git a/hedgewars.spec b/hedgewars.spec index 03bc5f7..65b4861 100644 --- a/hedgewars.spec +++ b/hedgewars.spec @@ -1,6 +1,6 @@ Name: hedgewars Version: 1.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Funny turn-based artillery game, featuring fighting Hedgehogs! License: GPL+ URL: http://www.hedgewars.org/ @@ -103,14 +103,14 @@ done # -DGHFLAGS=-dynamic uses dynamic linking for Haskell, but this isn't # available on arm. -# -DFONTS_DIRS="/usr/share/fonts/wqy-zenhei;/usr/share/fonts/dejavu" makes -# sure the system fonts are used. This avoids problems with physfs access +# -DFONTS_DIRS="/usr/share/fonts/wqy-zenhei;/usr/share/fonts/dejavu-sans-fonts" +# makes sure the system fonts are used. This avoids problems with physfs access # and having to symlink font files. %ifarch %{arm} -%cmake -DMINIMAL_FLAGS=1 -DNOVIDEOREC=1 -DBUILD_ENGINE_C=1 -DFONTS_DIRS="/usr/share/fonts/wqy-zenhei;/usr/share/fonts/dejavu" . +%cmake -DMINIMAL_FLAGS=1 -DNOVIDEOREC=1 -DBUILD_ENGINE_C=1 -DFONTS_DIRS="/usr/share/fonts/wqy-zenhei;/usr/share/fonts/dejavu-sans-fonts" . %else -%cmake -DMINIMAL_FLAGS=1 -DNOVIDEOREC=1 -DBUILD_ENGINE_C=1 -DGHFLAGS=-dynamic -DFONTS_DIRS="/usr/share/fonts/wqy-zenhei;/usr/share/fonts/dejavu" . +%cmake -DMINIMAL_FLAGS=1 -DNOVIDEOREC=1 -DBUILD_ENGINE_C=1 -DGHFLAGS=-dynamic -DFONTS_DIRS="/usr/share/fonts/wqy-zenhei;/usr/share/fonts/dejavu-sans-fonts" . %endif %make_build @@ -144,9 +144,6 @@ install -pm 0644 %{SOURCE102} %{buildroot}%{_prefix}/lib/firewalld/services/ # wipe out fonts to unbreak flatpak build find %{buildroot} -type f -name '*.ttc' | xargs rm -f -# DejaVuSans-Bold.ttf gets installed and needs to be removed. -rm %{buildroot}%{_datadir}/%{name}/Data/Fonts/DejaVuSans-Bold.ttf - %ldconfig_scriptlets %post server @@ -202,6 +199,9 @@ rm %{buildroot}%{_datadir}/%{name}/Data/Fonts/DejaVuSans-Bold.ttf %changelog +* Mon Apr 13 2020 Bruno Wolff III - 1.0.0-7 +- Handle change in where dejavu fonts are located + * Mon Apr 13 2020 Bruno Wolff III - 1.0.0-6 - Don't try to install DejaVuSans-Bold