rpms/lyx/devel .cvsignore, 1.47, 1.48 lyx.spec, 1.114, 1.115 sources, 1.45, 1.46

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19293

Modified Files:
	.cvsignore lyx.spec sources 
Log Message:
* Wed Jul 21 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.0.0-0.5.alpha5
- lyx-2.0.0-alpha5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	17 Jun 2010 18:31:31 -0000	1.47
+++ .cvsignore	21 Jul 2010 17:37:29 -0000	1.48
@@ -1 +1 @@
-lyx-2.0.0alpha4.tar.xz
+lyx-2.0.0alpha5.tar.xz


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- lyx.spec	17 Jun 2010 18:31:31 -0000	1.114
+++ lyx.spec	21 Jul 2010 17:37:29 -0000	1.115
@@ -1,8 +1,7 @@
 
 ## lyx-fonts
 %global fontname lyx
-#if 0%{?fedora} > 8
-%if 0
+%if 1 
 %define fontpackages 1
 BuildRequires: fontpackages-devel
 %else
@@ -11,12 +10,12 @@ BuildRequires: fontpackages-devel
 
 %define _without_included_boost --without-included-boost
 
-%define pre alpha4
+%define pre alpha5
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 2.0.0
-Release: 0.4.%{pre}%{?dist}
+Release: 0.5.%{pre}%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -146,11 +145,6 @@ A collection of Math symbol fonts for %{
 
 %build
 
-# debugging fun
-#LDFLAGS="$LDFLAGS -Wl,--as-needed"
-#LDFLAGS="$LDFLAGS -Wl,--no-add-needed"
-#export LDFLAGS
-
 %configure \
   --disable-dependency-tracking \
   --disable-rpath \
@@ -160,7 +154,7 @@ A collection of Math symbol fonts for %{
   --with-enchant \
   --with-hunspell 
 
-make %{?_smp_mflags} LIBS="-lX11"
+make %{?_smp_mflags}
 
 
 %install
@@ -255,13 +249,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
 
@@ -271,6 +267,9 @@ fc-cache %{_fontdir} 2> /dev/null ||:
 
 
 %changelog
+* Wed Jul 21 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.0.0-0.5.alpha5
+- lyx-2.0.0-alpha5
+
 * Thu Jun 17 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.0.0-0.4.alpha4
 - lyx-2.0.0-alpha4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	17 Jun 2010 18:31:31 -0000	1.45
+++ sources	21 Jul 2010 17:37:29 -0000	1.46
@@ -1 +1 @@
-0c459f2bcaf37a24280e4c855eb789cf  lyx-2.0.0alpha4.tar.xz
+b2032cf66394b44a61992c67f3205159  lyx-2.0.0alpha5.tar.xz