[extremetuxracer] phase out font compat symlinks from Fedora 21 on

Nils Philippsen nphilipp at fedoraproject.org
Thu Dec 12 13:21:32 UTC 2013


commit 4adce38ad1258ec16dbdbd00c93930a277265c70
Author: Nils Philippsen <nils at redhat.com>
Date:   Thu Dec 12 14:21:26 2013 +0100

    phase out font compat symlinks from Fedora 21 on

 extremetuxracer.spec |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/extremetuxracer.spec b/extremetuxracer.spec
index d3976c1..d18455f 100644
--- a/extremetuxracer.spec
+++ b/extremetuxracer.spec
@@ -8,10 +8,16 @@
 %global patch_ext %{nil}
 %endif
 
+%if %{?fedora}%{!?fedora:21} >= 21
+%bcond_with font_compat
+%else
+%bcond_without font_compat
+%endif
+
 Summary: High speed arctic racing game
 Name: extremetuxracer
 Version: 0.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://extremetuxracer.sourceforge.net
@@ -64,7 +70,11 @@ Requires: extremetuxracer-common = %{?epoch:%{epoch}:}%{version}-%{release}
 This package contains the PaperCuts 2.0 font which is used by Extreme Tux
 Racer.
 
+%if %{with font_compat}
 %_font_pkg -n papercuts pc_20.ttf PaperCuts20.ttf
+%else
+%_font_pkg -n papercuts pc_20.ttf
+%endif
 
 %package papercuts-outline-fonts
 Summary: PaperCuts Outline 2.0 font
@@ -75,7 +85,11 @@ Requires: extremetuxracer-common = %{?epoch:%{epoch}:}%{version}-%{release}
 This package contains the PaperCuts Outline 2.0 font which is used by Extreme
 Tux Racer.
 
+%if %{with font_compat}
 %_font_pkg -n papercuts-outline pc_outline.ttf PaperCuts_outline.ttf
+%else
+%_font_pkg -n papercuts-outline pc_outline.ttf
+%endif
 
 %prep
 %setup -q -n etr-%{version}%{?patch_ext}
@@ -114,9 +128,11 @@ ln -s "%{buildroot}%{_fontbasedir}/gnu-free/FreeSans.ttf" std.ttf
 symlinks -c -s .
 rm -rf "%{buildroot}%{_fontbasedir}/gnu-free"
 popd
+%if %{with font_compat}
 # compat symlinks for 3rd party users
 ln -s pc_20.ttf "%{buildroot}%{_fontdir}/PaperCuts20.ttf"
 ln -s pc_outline.ttf "%{buildroot}%{_fontdir}/PaperCuts_outline.ttf"
+%endif
 # move docs in correct location
 mv -f %{buildroot}%{_docdir}/etr %{buildroot}%{_pkgdocdir}
 
@@ -139,6 +155,9 @@ rm -rf %{buildroot}
 %doc AUTHORS COPYING ChangeLog
 
 %changelog
+* Thu Dec 12 2013 Nils Philippsen <nils at redhat.com> - 0.6.0-3
+- phase out font compat symlinks from Fedora 21 on
+
 * Wed Dec 11 2013 Nils Philippsen <nils at redhat.com> - 0.6.0-2
 - install appdata file (#1036330)
 


More information about the scm-commits mailing list