removed --with texmf configure option and added xdg-open patch

OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=25

lyx-2.0.0rc1-xdg_open.patch

@@ -0,0 +1,52 @@
+diff -ur lyx-2.0.0rc1.orig/lib/configure.py lyx-2.0.0rc1/lib/configure.py
+--- lyx-2.0.0rc1.orig/lib/configure.py	2011-03-01 22:45:24.000000000 +0000
++++ lyx-2.0.0rc1/lib/configure.py	2011-03-11 18:53:32.189708571 +0000
+@@ -458,7 +458,7 @@
+     checkViewerEditor('a SVG viewer and editor', ['inkscape'],
+         rc_entry = [r'\Format svg        svg     SVG                    "" "%%" "%%"	"vector"'])
+     #
+-    path, iv = checkViewerNoRC('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'],
++    path, iv = checkViewerNoRC('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp-remote', 'gimp'],
+         rc_entry = [r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"	""
+ \Format gif        gif     GIF                    "" "%s"	"%s"	""
+ \Format jpg        jpg     JPEG                   "" "%s"	"%s"	""
+@@ -521,7 +521,7 @@
+ \Format excel      xls    "Excel spreadsheet"      "" "" "%%"    "document" 
+ \Format oocalc     ods    "OpenOffice spreadsheet" "" "" "%%"    "document"''']) 
+  #
+-    path, xhtmlview = checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
++    path, xhtmlview = checkViewer('an HTML previewer', ['xdg-open', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
+         rc_entry = [r'\Format xhtml      xhtml   "LyXHTML"              y "%%" ""    "document,menu=export"'])
+     if xhtmlview == "":
+         addToRC(r'\Format xhtml      xhtml   "LyXHTML"              y "" ""  "document,menu=export"')
+@@ -535,11 +535,11 @@
+     #
+     #checkProg('a Postscript interpreter', ['gs'],
+     #  rc_entry = [ r'\ps_command "%%"' ])
+-    checkViewer('a Postscript previewer', ['kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'],
++    checkViewer('a Postscript previewer', ['xdg-open', 'kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'],
+         rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""	"vector"
+ \Format ps         ps      Postscript             t  "%%"	""	"document,vector"'''])
+     # for xdg-open issues look here: http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg151818.html
+-    checkViewer('a PDF previewer', ['kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
++    checkViewer('a PDF previewer', ['xdg-open', 'kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
+ 		    'gv', 'ghostview'],
+         rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""	"document,vector,menu=export"
+ \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""	"document,vector,menu=export"
+@@ -547,14 +547,14 @@
+ \Format pdf4       pdf    "PDF (XeTeX)"           X  "%%"	""	"document,vector,menu=export"
+ \Format pdf5       pdf    "PDF (LuaTeX)"          u  "%%"	""	"document,vector,menu=export"'''])
+     #
+-    checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'yap', 'dviout -Set=!m'],
++    checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi', 'okular', 'yap', 'dviout -Set=!m'],
+         rc_entry = [r'''\Format dvi        dvi     DVI                    D  "%%"	""	"document,vector,menu=export"
+ \Format dvi3       dvi     "DVI (LuaTeX)"          V  "%%"	""	"document,vector,menu=export"'''])
+     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', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
+         rc_entry = [r'\Format html       html    HTML                   H  "%%"	""	"document,menu=export"'])
+     #
+     checkViewerEditor('Noteedit', ['noteedit'],

lyx.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 28 19:56:30 UTC 2011 - cornelis@solcon.nl
+
+- Removed --with-texmf configure option (is not supported by the configure script)
+- Added xdg-open patch from fedora
+
 -------------------------------------------------------------------
 Tue May 31 12:13:08 UTC 2011 - cornelis@solcon.nl
 

lyx.spec

@@ -36,6 +36,9 @@ Source3:        lyxrc.dist
 # hunspell pkgconfig support
 # see http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg169351.html
 Patch0:         lyx-2.0.0-hunspell_pkgconfig.patch
+# xdg path from fedora
+# This was rejected by upstream (http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg133878.html)
+Patch1:         lyx-2.0.0rc1-xdg_open.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 Recommends:     texlive-xetex xindy
@@ -50,6 +53,7 @@ each paragraph. Of course, low level formatting is still possible.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 #%{?suse_update_config:%{suse_update_config -f config}}
@@ -64,7 +68,6 @@ TEXMF=$(kpsexpand '$TEXMFDIST')
 %endif
 %endif
 %configure \
-    --with-texmf=$TEXMF \
     --without-included-boost \
 %if %suse_version < 1020
     --with-extra-inc=/usr/X11R6/include/X11 \