rpms/lyx/FC-4 lyx-1.3.7-helpers.patch, NONE, 1.1 lyx-1.3.7-noxfonts.patch, NONE, 1.1 lyx.spec, 1.14, 1.15

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19384

Modified Files:
	lyx.spec 
Added Files:
	lyx-1.3.7-helpers.patch lyx-1.3.7-noxfonts.patch 
Log Message:
include 1.3.7 patches


lyx-1.3.7-helpers.patch:

--- NEW FILE lyx-1.3.7-helpers.patch ---
--- lyx-1.3.7/lib/configure.m4.helpers	2006-01-11 10:32:15.000000000 -0600
+++ lyx-1.3.7/lib/configure.m4	2006-01-17 11:55:31.000000000 -0600
@@ -269,7 +269,7 @@
 test $image_command = "convert" && image_command="convert \$\$i \$\$o"
 
 # Search something to preview postscript
-SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,gsview32 gv ghostview kghostview)
+SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,evince gsview32 gsview ggv kghostview gv ghostview)
 case $GHOSTVIEW in
   ghostview) PS_VIEWER="$GHOSTVIEW -swap" ;;
   *) PS_VIEWER="$GHOSTVIEW";;
@@ -277,13 +277,13 @@
 EPS_VIEWER=$GHOSTVIEW
 
 # Search for a program to preview pdf
-SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview)
+SEARCH_PROG([for a PDF previewer],PDF_VIEWER, evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview)
 
 # Search something to preview dvi
 SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi)
 
 # Search something to preview html
-SEARCH_PROG([for an HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape)
+SEARCH_PROG([for an HTML previewer],HTML_VIEWER, "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape)
 
 # Search for a program to convert ps to pdf
 SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, "ps2pdf13 \$\$i")
--- lyx-1.3.7/lib/configure.helpers	2006-01-16 08:51:48.000000000 -0600
+++ lyx-1.3.7/lib/configure	2006-01-17 12:00:54.000000000 -0600
@@ -478,9 +478,9 @@
 
 # Search something to preview postscript
 echo $ac_n "checking for a Postscript previewer""... $ac_c"
-echo "$ac_t""(gsview32 gv ghostview kghostview)"
+echo "$ac_t""(evince gsview32 gsview ggv kghostview gv ghostview)"
 GHOSTVIEW=
-for ac_prog in gsview32 gv ghostview kghostview
+for ac_prog in evince gsview32 gsview ggv kghostview gv ghostview
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -519,9 +519,9 @@
 
 # Search for a program to preview pdf
 echo $ac_n "checking for a PDF previewer""... $ac_c"
-echo "$ac_t""(acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview)"
+echo "$ac_t""(evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview)"
 PDF_VIEWER=
-for ac_prog in acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview
+for ac_prog in evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -591,9 +591,9 @@
 
 # Search something to preview html
 echo $ac_n "checking for an HTML previewer""... $ac_c"
-echo "$ac_t""("mozilla file://\$\$p\$\$i" netscape)"
+echo "$ac_t""("htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape)"
 HTML_VIEWER=
-for ac_prog in "mozilla file://\$\$p\$\$i" netscape
+for ac_prog in "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2

lyx-1.3.7-noxfonts.patch:

--- NEW FILE lyx-1.3.7-noxfonts.patch ---
--- lyx-1.3.7/lib/configure.noxfonts	2006-01-17 12:00:54.000000000 -0600
+++ lyx-1.3.7/lib/configure	2006-01-17 12:14:49.000000000 -0600
@@ -1610,6 +1610,8 @@
 EOF
 fi
 
+## DISABLED (by default), rely on already-present mathml-fonts
+if [ "x${use_xfonts}" == "xtrue"]; then 
 ######## X FONTS
 # create a fonts.dir file to make X fonts available to LyX
 echo "checking for TeX fonts"
@@ -1643,6 +1645,7 @@
   (cd xfonts ; rm -f PSres.upr ; makepsres) 2>/dev/null || true
 fi
 rm -f xfonts/tmpfonts
+fi
 
 
 # Remove superfluous files if we are not writing in the main lib
--- lyx-1.3.7/lib/configure.m4.noxfonts	2006-01-17 11:55:31.000000000 -0600
+++ lyx-1.3.7/lib/configure.m4	2006-01-17 12:14:31.000000000 -0600
@@ -676,7 +676,9 @@
 EOF
 fi
 
-######## X FONTS
+## DISABLED (by default), rely on already-present mathml-fonts
+if [ "x${use_xfonts}" == "xtrue"]; then
+######## X FONTS 
 # create a fonts.dir file to make X fonts available to LyX
 echo "checking for TeX fonts"
 
@@ -709,6 +711,7 @@
   (cd xfonts ; rm -f PSres.upr ; makepsres) 2>/dev/null || true
 fi
 rm -f xfonts/tmpfonts
+fi
 
 
 # Remove superfluous files if we are not writing in the main lib


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lyx.spec	20 Jan 2006 17:51:39 -0000	1.14
+++ lyx.spec	20 Jan 2006 17:53:07 -0000	1.15
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.3.7 
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -219,7 +219,7 @@
 
 
 %changelog
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-3
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-4
 - cleanup/fix snarfing of intermediate frontend builds.
 
 * Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2