[lyx/f14/master] Update for rc1 and add a dependency to ensure that math instant preview works by default.

[José Abílio Oliveira Matos]

commit 808ab39e798b8c4fc8f7a96d7971d0432971184b
Author: José Matos <jamatos at fedoraproject.org>
Date:   Fri Mar 11 17:45:58 2011 +0000

    Update for rc1 and add a dependency to ensure that math instant preview works by default.

 .gitignore |    3 +--
 lyx.spec   |   38 +++++++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f755421..3324666 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/lyx-2.0.0beta3.tar.xz
-/lyx-2.0.0beta4.tar.xz
+/lyx-2.0.0rc1.tar.xz
diff --git a/lyx.spec b/lyx.spec
index b76ca80..873eeba 100644
--- a/lyx.spec
+++ b/lyx.spec
@@ -1,7 +1,7 @@
 
 ## lyx-fonts
 %global fontname lyx
-%if 1 
+%if 1
 %define fontpackages 1
 BuildRequires: fontpackages-devel
 %else
@@ -10,12 +10,12 @@ BuildRequires: fontpackages-devel
 
 %define _without_included_boost --without-included-boost
 
-%define pre beta4
+%define pre rc1
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 2.0.0
-Release: 0.13.%{pre}%{?dist}
+Release: 0.14.%{pre}%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -82,6 +82,11 @@ Requires: tetex-IEEEtran
 # convert doc files to lyx (bug #193858)
 Requires: wv
 Requires: xdg-utils
+# required for instant preview
+# we use a file require because depending on the texlive version used
+# the package can either be texlive-dviutils for texlive 2007 or
+# texlive-dtl-bin for texlive >= 2010
+Requires: /usr/bin/dv2dt
 
 %description
 LyX is a modern approach to writing documents which breaks with the
@@ -120,22 +125,22 @@ Obsoletes: mathml-fonts < 1.0-50
 Provides:  mathml-fonts = 1.0-50
 Obsoletes: lyx-fonts-common < 1.6.5-3
 Obsoletes: lyx-fonts-compat < 1.6.5-3
-Obsoletes: lyx-cmex10-fonts < 1.6.5-3 
-Obsoletes: lyx-cmmi10-fonts < 1.6.5-3 
-Obsoletes: lyx-cmr10-fonts < 1.6.5-3 
-Obsoletes: lyx-cmsy10-fonts < 1.6.5-3 
-Obsoletes: lyx-esint10-fonts < 1.6.5-3 
-Obsoletes: lyx-eufm10-fonts < 1.6.5-3 
-Obsoletes: lyx-msam10-fonts < 1.6.5-3 
-Obsoletes: lyx-msbm10-fonts < 1.6.5-3 
-Obsoletes: lyx-wasy10-fonts < 1.6.5-3 
+Obsoletes: lyx-cmex10-fonts < 1.6.5-3
+Obsoletes: lyx-cmmi10-fonts < 1.6.5-3
+Obsoletes: lyx-cmr10-fonts < 1.6.5-3
+Obsoletes: lyx-cmsy10-fonts < 1.6.5-3
+Obsoletes: lyx-esint10-fonts < 1.6.5-3
+Obsoletes: lyx-eufm10-fonts < 1.6.5-3
+Obsoletes: lyx-msam10-fonts < 1.6.5-3
+Obsoletes: lyx-msbm10-fonts < 1.6.5-3
+Obsoletes: lyx-wasy10-fonts < 1.6.5-3
 Provides:  lyx-cmex10-fonts = %{version}-%{release}
 Provides:  lyx-cmmi10-fonts = %{version}-%{release}
 Provides:  lyx-cmr10-fonts = %{version}-%{release}
 Provides:  lyx-cmsy10-fonts = %{version}-%{release}
 BuildArch: noarch
 %description  fonts
-A collection of Math symbol fonts for %{name}. 
+A collection of Math symbol fonts for %{name}.
 
 
 %prep
@@ -155,7 +160,7 @@ A collection of Math symbol fonts for %{name}.
   --enable-optimization="%{optflags}" \
   --without-included-boost \
   --with-enchant \
-  --with-hunspell 
+  --with-hunspell
 
 make %{?_smp_mflags}
 
@@ -270,6 +275,9 @@ fc-cache %{_fontdir} 2> /dev/null ||:
 
 
 %changelog
+* Fri Mar 11 2011 José Matos <jamatos at fedoraproject.org> - 2.0.0-0.14.rc1
+- Update for rc1 and add a dependency to ensure that math instant preview works by default.
+
 * Mon Feb 07 2011 Rex Dieter <rdieter at fedoraproject.org> 2.0.0-0.13.beta4
 - 2.0.0-beta4
 
@@ -315,7 +323,7 @@ fc-cache %{_fontdir} 2> /dev/null ||:
 * Thu Jan 21 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.5-4
 - -fonts: Provides: lyx-{cmex10,cmmi10,cmr10,cmsy10}-fonts
 
-* Sat Jan 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.5-3 
+* Sat Jan 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.5-3
 - rebiuld (boost)
 - use simple font template