rpms/lyx/devel lyx-1.6.0-xdg_open.patch, NONE, 1.1 lyx.spec, 1.80, 1.81 lyx-1.5.4-xdg_open.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19352

Modified Files:
	lyx.spec 
Added Files:
	lyx-1.6.0-xdg_open.patch 
Removed Files:
	lyx-1.5.4-xdg_open.patch 
Log Message:
respin xdg_open patch


lyx-1.6.0-xdg_open.patch:

--- NEW FILE lyx-1.6.0-xdg_open.patch ---
diff -up lyx-1.6.0rc4/lib/configure.py.xdg_open lyx-1.6.0rc4/lib/configure.py
--- lyx-1.6.0rc4/lib/configure.py.xdg_open	2008-10-23 10:30:17.000000000 -0500
+++ lyx-1.6.0rc4/lib/configure.py	2008-10-24 19:20:53.000000000 -0500
@@ -260,7 +260,7 @@ def checkFormatEntries(dtl_tools):  
     checkViewer('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'],
         rc_entry = [r'\Format fen        fen     FEN                    "" "%%"	"%%"	""'])
     #
-    path, iv = checkViewer('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'])
+    path, iv = checkViewer('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp-remote', 'gimp'])
     path, ie = checkViewer('a raster image editor', ['gimp-remote', 'gimp'])
     addToRC(r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"	""
 \Format gif        gif     GIF                    "" "%s"	"%s"	""
@@ -303,29 +303,29 @@ def checkFormatEntries(dtl_tools):  
     #
     #checkProg('a Postscript interpreter', ['gs'],
     #  rc_entry = [ r'\ps_command "%%"' ])
-    checkViewer('a Postscript previewer', ['kghostview', 'evince', 'gv', 'ghostview -swap'],
+    checkViewer('a Postscript previewer', ['xdg-open', 'kghostview', 'evince', 'gv', 'ghostview -swap'],
         rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""	"vector"
 \Format ps         ps      Postscript             t  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a PDF previewer', ['kpdf', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
+    checkViewer('a PDF previewer', ['xdg-open', 'kpdf', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
 		    'gv', 'ghostview'],
         rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""	"document,vector"
 \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""	"document,vector"
 \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a DVI previewer', ['xdvi', 'kdvi'],
+    checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi'],
         rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""	"document,vector"'])
     if dtl_tools:
         # Windows only: DraftDVI
         addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	""	"vector"')
     #
-    checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
+    checkViewer('an HTML previewer', ['xdg-open', 'htmlview', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
         rc_entry = [r'\Format html       html    HTML                   H  "%%"	""	"document"'])
     #
     checkViewer('Noteedit', ['noteedit'],
         rc_entry = [r'\Format noteedit   not     Noteedit               "" "%%"	"%%"	"vector"'])
     #
-    checkViewer('an OpenDocument viewer', ['swriter', 'oowriter'],
+    checkViewer('an OpenDocument viewer', ['xdg-open', 'swriter', 'oowriter'],
         rc_entry = [r'\Format odt        odt     OpenDocument           "" "%%"	"%%"	"document,vector"'])
     #
     # entried that do not need checkProg


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- lyx.spec	24 Oct 2008 22:16:21 -0000	1.80
+++ lyx.spec	25 Oct 2008 00:21:43 -0000	1.81
@@ -14,7 +14,7 @@
 Source0: ftp://ftp.devel.lyx.org/pub/lyx/devel/lyx-%{version}%{pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: lyx-1.5.4-xdg_open.patch
+Patch1: lyx-1.6.0-xdg_open.patch
 
 Source1: lyxrc.dist
 


--- lyx-1.5.4-xdg_open.patch DELETED ---