[lyx/epel7] .spec cleanup: use fontpackages unconditionally

[Rex Dieter]

commit 6c2796df83bc2164a7cca07f8d5eb0c79b19a00b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Jul 18 10:43:27 2014 -0500

    .spec cleanup: use fontpackages unconditionally

 lyx.spec |   19 +------------------
 1 files changed, 1 insertions(+), 18 deletions(-)
---
diff --git a/lyx.spec b/lyx.spec
index 17d6a75..557bbff 100644
--- a/lyx.spec
+++ b/lyx.spec
@@ -1,12 +1,7 @@
 
 ## lyx-fonts
 %global fontname lyx
-%if 1
-%define fontpackages 1
 BuildRequires: fontpackages-devel
-%else
-%define _fontdir %{_datadir}/fonts/%{fontname}
-%endif
 
 %define _without_included_boost --without-included-boost
 
@@ -143,7 +138,7 @@ Group:   Applications/Publishing
 # kindly granted permission to use and modify these fonts."
 # One of the font files (wasy10) is separately licensed GPL+.
 License: Copyright only and GPL+
-%{?fontpackages:Requires: fontpackages-filesystem}
+Requires: fontpackages-filesystem
 Obsoletes: mathml-fonts < 1.0-50
 Provides:  mathml-fonts = 1.0-50
 Obsoletes: lyx-fonts-common < 1.6.5-3
@@ -291,22 +286,10 @@ rm -rf %{buildroot}
 %{_datadir}/appdata/
 %{_sysconfdir}/bash_completion.d
 
-%if 0%{?fontpackages:1}
 %_font_pkg
 %{_fontdir}/*.ttf
 %doc lib/fonts/BaKoMaFontLicense.txt
 %doc lib/fonts/ReadmeBaKoMa4LyX.txt
-%else
-%files fonts
-%defattr(-,root,root,-)
-%dir %{_fontdir}/
-%{_fontdir}/*.ttf
-%doc lib/fonts/BaKoMaFontLicense.txt
-%doc lib/fonts/ReadmeBaKoMa4LyX.txt
-
-%posttrans fonts
-fc-cache %{_fontdir} 2> /dev/null ||:
-%endif
 
 
 %changelog