diff --git a/.gitignore b/.gitignore index 16cc9a4..d84fba7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/lyx-2.0.0beta2.tar.xz +/lyx-2.0.0beta3.tar.xz diff --git a/lyx-2.0.0beta2-xdg_open.patch b/lyx-2.0.0beta2-xdg_open.patch deleted file mode 100644 index cbc0396..0000000 --- a/lyx-2.0.0beta2-xdg_open.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -up lyx-2.0.0beta2/lib/configure.py.xdg_open lyx-2.0.0beta2/lib/configure.py ---- lyx-2.0.0beta2/lib/configure.py.xdg_open 2010-12-06 07:28:21.000000000 -0600 -+++ lyx-2.0.0beta2/lib/configure.py 2010-12-08 12:56:39.436550751 -0600 -@@ -458,7 +458,7 @@ def checkFormatEntries(dtl_tools): - 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" "" -@@ -516,7 +516,7 @@ def checkFormatEntries(dtl_tools): - \Format text4 txt "Plain text (catdvi)" "" "" "%%" "document" - \Format textparagraph txt "Plain Text, Join Lines" "" "" "%%" "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"']) - if xhtmlview == "": - addToRC(r'\Format xhtml xhtml "LyXHTML" y "" "" "document"') -@@ -530,11 +530,11 @@ def checkFormatEntries(dtl_tools): - # - #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" - \Format pdf2 pdf "PDF (pdflatex)" F "%%" "" "document,vector" -@@ -542,14 +542,14 @@ def checkFormatEntries(dtl_tools): - \Format pdf4 pdf "PDF (XeTeX)" X "%%" "" "document,vector" - \Format pdf5 pdf "PDF (LuaTeX)" u "%%" "" "document,vector"''']) - # -- 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" - \Format dvi3 dvi "DVI (LuaTeX)" V "%%" "" "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', 'firefox', 'mozilla file://$$p$$i', 'netscape'], - rc_entry = [r'\Format html html HTML H "%%" "" "document"']) - # - checkViewerEditor('Noteedit', ['noteedit'], diff --git a/lyx-2.0.0beta3-xdg_open.patch b/lyx-2.0.0beta3-xdg_open.patch new file mode 100644 index 0000000..6037727 --- /dev/null +++ b/lyx-2.0.0beta3-xdg_open.patch @@ -0,0 +1,52 @@ +diff -up lyx-2.0.0beta3/lib/configure.py.xdg_open lyx-2.0.0beta3/lib/configure.py +--- lyx-2.0.0beta3/lib/configure.py.xdg_open 2011-01-07 16:12:01.000000000 -0600 ++++ lyx-2.0.0beta3/lib/configure.py 2011-01-11 10:50:20.084008478 -0600 +@@ -458,7 +458,7 @@ def checkFormatEntries(dtl_tools): + 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 @@ def checkFormatEntries(dtl_tools): + \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"']) + if xhtmlview == "": + addToRC(r'\Format xhtml xhtml "LyXHTML" y "" "" "document"') +@@ -535,11 +535,11 @@ def checkFormatEntries(dtl_tools): + # + #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" + \Format pdf2 pdf "PDF (pdflatex)" F "%%" "" "document,vector" +@@ -547,14 +547,14 @@ def checkFormatEntries(dtl_tools): + \Format pdf4 pdf "PDF (XeTeX)" X "%%" "" "document,vector" + \Format pdf5 pdf "PDF (LuaTeX)" u "%%" "" "document,vector"''']) + # +- 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" + \Format dvi3 dvi "DVI (LuaTeX)" V "%%" "" "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', 'firefox', 'mozilla file://$$p$$i', 'netscape'], + rc_entry = [r'\Format html html HTML H "%%" "" "document"']) + # + checkViewerEditor('Noteedit', ['noteedit'], diff --git a/lyx.spec b/lyx.spec index 3db4de2..a6348fa 100644 --- a/lyx.spec +++ b/lyx.spec @@ -10,12 +10,12 @@ BuildRequires: fontpackages-devel %define _without_included_boost --without-included-boost -%define pre beta2 +%define pre beta3 Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 2.0.0 -Release: 0.10.%{pre}%{?dist} +Release: 0.11.%{pre}%{?dist} License: GPLv2+ Group: Applications/Publishing @@ -29,7 +29,7 @@ Source10: lyx.desktop ## upstreamable patches # submitted, but upstream rejected it. we currently agree to disagree. -Patch50: lyx-2.0.0beta2-xdg_open.patch +Patch50: lyx-2.0.0beta3-xdg_open.patch %if 0%{?autotools} BuildRequires: automake libtool @@ -267,6 +267,9 @@ fc-cache %{_fontdir} 2> /dev/null ||: %changelog +* Tue Jan 11 2011 Rex Dieter 2.0.0-0.11.beta3 +- lyx-2.0.0-beta3 + * Wed Dec 08 2010 Rex Dieter 2.0.0-0.10.beta2 - lyx-2.0.0-beta2 diff --git a/sources b/sources index 79ff4a4..b13ae9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fef17d870ac96f975024936ddb10e69f lyx-2.0.0beta2.tar.xz +f88c0b74c1fe61c074f098ca92a29f30 lyx-2.0.0beta3.tar.xz