[lyx/f13/master] * Thu Jul 15 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.7-1 - lyx-1.6.7 - use fontpackages-de

[Rex Dieter]

commit f206330c0851d21570c8466d7bb5b7bf925dd483
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 6 09:28:33 2010 -0500

    * Thu Jul 15 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.7-1
    - lyx-1.6.7
    - use fontpackages-devel

 .gitignore |    1 +
 lyx.spec   |   25 ++++++++++++-------------
 sources    |    2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1412e76..e794eb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 lyx-1.6.6.1.tar.bz2
+lyx-1.6.7.tar.bz2
diff --git a/lyx.spec b/lyx.spec
index 774131d..06b3b12 100644
--- a/lyx.spec
+++ b/lyx.spec
@@ -9,8 +9,9 @@
 
 ## lyx-fonts
 %global fontname lyx
+
 #if 0%{?fedora} > 8
-%if 0
+%if 1
 %define fontpackages 1
 BuildRequires: fontpackages-devel
 %else
@@ -21,7 +22,7 @@ BuildRequires: fontpackages-devel
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.6.6.1
+Version: 1.6.7
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -32,10 +33,6 @@ Source0: ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/lyx-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: lyx-1.6.6-xdg_open.patch
-## upstreamable patches
-# fix implicit linking to -lX11, not quite upstreamable yet, configure isn't 
-# setting X_LIBS=-lX11 properly
-Patch51: lyx-1.6.6-ImplicitDSOLinking_X11.patch
 
 Source1: lyxrc.dist
 
@@ -151,9 +148,6 @@ A collection of Math symbol fonts for %{name}.
 
 %patch1 -p1 -b .xdg_open
 
-# not fully upstreamable, configure isn't setting X_LIBS=-X11 for some reason
-%patch51 -p1 -b .ImplicitDSOLinking_X11
-
 
 %build
 
@@ -167,8 +161,7 @@ A collection of Math symbol fonts for %{name}.
   %{?_with_aiksaurus} \
   %{?_without_included_boost}
 
-# X_LIBS , see patch51
-make %{?_smp_mflags} X_LIBS=-lX11
+make %{?_smp_mflags}
 
 
 %install
@@ -263,13 +256,15 @@ rm -rf %{buildroot}
 %{_datadir}/texmf/tex/latex/lyx/
 
 %if 0%{?fontpackages:1}
-%_font_pkg fonts %{_fontdir}/
+%_font_pkg 
+%{_fontdir}/*.ttf
 %doc lib/fonts/BaKoMaFontLicense.txt
 %doc lib/fonts/ReadmeBaKoMa4LyX.txt
 %else
 %files fonts
 %defattr(-,root,root,-)
-%{_fontdir}/
+%dir %{_fontdir}/
+%{_fontdir}/*.ttf
 %doc lib/fonts/BaKoMaFontLicense.txt
 %doc lib/fonts/ReadmeBaKoMa4LyX.txt
 
@@ -279,6 +274,10 @@ fc-cache %{_fontdir} 2> /dev/null ||:
 
 
 %changelog
+* Thu Jul 15 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.7-1
+- lyx-1.6.7
+- use fontpackages-devel
+
 * Sun May 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.6.1-1
 - lyx-1.6.6.1
 
diff --git a/sources b/sources
index efc30a4..f963f5b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a17e4c37f7def9f18052e03634d42ca5  lyx-1.6.6.1.tar.bz2
+078a3568f41ceb6dd5f090071aab93bc  lyx-1.6.7.tar.bz2