[lyx/f12/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 b76da2b4cfce27e7238b8f975ac15a46b0b0100c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 6 14:43:54 2010 -0500

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

 .gitignore |    2 +-
 lyx.spec   |   61 +++++++++++++++++++++++------------------------------------
 sources    |    2 +-
 3 files changed, 26 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5f58129..9e0a0f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-lyx-1.6.5.tar.bz2
+lyx-1.6.7.tar.bz2
diff --git a/lyx.spec b/lyx.spec
index f0e0d24..06b3b12 100644
--- a/lyx.spec
+++ b/lyx.spec
@@ -3,14 +3,15 @@
 %define _with_aiksaurus --with-aiksaurus
 %endif
 
-%if 0%{?fedora} > 9
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
 %define build_noarch BuildArch: noarch
 %endif
 
 ## lyx-fonts
 %global fontname lyx
+
 #if 0%{?fedora} > 8
-%if 0
+%if 1
 %define fontpackages 1
 BuildRequires: fontpackages-devel
 %else
@@ -21,27 +22,17 @@ BuildRequires: fontpackages-devel
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.6.5
-Release: 5%{?dist}
+Version: 1.6.7
+Release: 1%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
-#Source0: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
-Source0: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%{version}%{?pre}.tar.bz2
+Source0: ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/lyx-%{version}.tar.bz2
+#Source0: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%{version}%{?pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: lyx-1.6.5-xdg_open.patch
-# This patch should be upstream for lyx-1.6.6
-# (we only need this because of patch #50)
-Patch2: lyx-1.6.5-autoconf_2.65.patch
-## upstreamable patches
-# http://bugzilla.redhat.com/524046 , http://www.lyx.org/trc/ticket/6226
-Patch50: lyx-1.6.5-enchant.patch
-# fix implicit linking to -lX11, not quite upstreamable yet, configure isn't 
-# setting X_LIBS=-lX11 properly
-Patch51: lyx-1.6.5-ImplicitDSOLinking_X11.patch
-Patch52: lyx-1.6.5-ImplicitDSOLinking_pthread.patch
+Patch1: lyx-1.6.6-xdg_open.patch
 
 Source1: lyxrc.dist
 
@@ -50,8 +41,7 @@ Source10: lyx.desktop
 %if 0%{?_with_aiksaurus:1}
 BuildRequires: aiksaurus-devel
 %endif
-# enchant support, via patch50, needs reauto*foo'ing
-BuildRequires: enchant-devel automake libtool
+BuildRequires: enchant-devel
 %if 0%{?_without_included_boost:1}
 BuildRequires: boost-devel
 %endif
@@ -157,25 +147,10 @@ A collection of Math symbol fonts for %{name}.
 %setup -q -n %{name}-%{version}%{?pre}
 
 %patch1 -p1 -b .xdg_open
-%patch2 -p1 -b .autoconf_2.65
-
-%patch50 -p1 -b .enchant
-# not fully upstreamable, configure isn't setting X_LIBS=-X11 for some reason
-%patch51 -p1 -b .ImplicitDSOLinking_X11
-# may or may not be needed on f13+ (I did while testing with -Wl,--no-add-needed on f12)
-#patch52 -p1 -b .ImplicitDSOLinking_pthread
-
-# needed by patch50/51
-./autogen.sh
 
 
 %build
 
-# debugging fun
-#LDFLAGS="$LDFLAGS -Wl,--as-needed"
-#LDFLAGS="$LDFLAGS -Wl,--no-add-needed"
-#export LDFLAGS
-
 %configure \
   --disable-dependency-tracking \
   --disable-rpath \
@@ -186,7 +161,7 @@ A collection of Math symbol fonts for %{name}.
   %{?_with_aiksaurus} \
   %{?_without_included_boost}
 
-make %{?_smp_mflags} X_LIBS=-lX11
+make %{?_smp_mflags}
 
 
 %install
@@ -281,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
 
@@ -297,6 +274,16 @@ 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
+
+* Fri May 21 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.6-1
+- lyx-1.6.6
+
 * Sun Feb 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.5-5
 - FTBFS lyx-1.6.5-4.fc13: ImplicitDSOLinking (#565009)
 
diff --git a/sources b/sources
index c16a583..f963f5b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-35a10d8cb8e4bdd296092d9d981330c9  lyx-1.6.5.tar.bz2
+078a3568f41ceb6dd5f090071aab93bc  lyx-1.6.7.tar.bz2