diff --git a/.gitignore b/.gitignore index 318cf0c..e056040 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -/lyx-2.0.4.tar.xz -/lyx-2.0.5.tar.xz -/lyx-2.0.5.1.tar.xz /lyx-2.0.6.tar.xz +/lyx-2.0.7.tar.xz diff --git a/lyx-2.0.6-xdg_open.patch b/lyx-2.0.6-xdg_open.patch deleted file mode 100644 index 0d1f501..0000000 --- a/lyx-2.0.6-xdg_open.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/lib/configure.py b/lib/configure.py -index cad1502..e049377 100644 ---- a/lib/configure.py -+++ b/lib/configure.py -@@ -547,7 +547,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" "" -@@ -615,7 +615,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,menu=export"']) - if xhtmlview == "": - addToRC(r'\Format xhtml xhtml "LyXHTML" y "" "" "document,menu=export"') -@@ -630,11 +630,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,menu=export"''']) - # for xdg-open issues look here: http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg151818.html -- checkViewer('a PDF previewer', ['pdfview', 'kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \ -+ checkViewer('a PDF previewer', ['xdg-open', 'pdfview', '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" -@@ -642,14 +642,14 @@ def checkFormatEntries(dtl_tools): - \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'], diff --git a/lyx-2.0.7-xdg_open.patch b/lyx-2.0.7-xdg_open.patch new file mode 100644 index 0000000..0d1f501 --- /dev/null +++ b/lyx-2.0.7-xdg_open.patch @@ -0,0 +1,53 @@ +diff --git a/lib/configure.py b/lib/configure.py +index cad1502..e049377 100644 +--- a/lib/configure.py ++++ b/lib/configure.py +@@ -547,7 +547,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" "" +@@ -615,7 +615,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,menu=export"']) + if xhtmlview == "": + addToRC(r'\Format xhtml xhtml "LyXHTML" y "" "" "document,menu=export"') +@@ -630,11 +630,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,menu=export"''']) + # for xdg-open issues look here: http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg151818.html +- checkViewer('a PDF previewer', ['pdfview', 'kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \ ++ checkViewer('a PDF previewer', ['xdg-open', 'pdfview', '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" +@@ -642,14 +642,14 @@ def checkFormatEntries(dtl_tools): + \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'], diff --git a/lyx.spec b/lyx.spec index 33f5ac9..eaa2ac5 100644 --- a/lyx.spec +++ b/lyx.spec @@ -12,8 +12,8 @@ BuildRequires: fontpackages-devel Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx -Version: 2.0.6 -Release: 3%{?dist} +Version: 2.0.7 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Publishing @@ -26,7 +26,7 @@ Source10: lyx.desktop ## upstreamable patches # submitted, but upstream rejected it. we currently agree to disagree. -Patch50: lyx-2.0.6-xdg_open.patch +Patch50: lyx-2.0.7-xdg_open.patch # Do we need to rebuild configuration files? %global autotools 0 @@ -284,6 +284,9 @@ fc-cache %{_fontdir} 2> /dev/null ||: %changelog +* Sat Dec 21 2013 José Matos - 2.0.7-1 +- update to 2.0.7 + * Sat Aug 03 2013 Fedora Release Engineering - 2.0.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 82589de..6978291 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9263fb53a5f878d67b00e2d8aec9748a lyx-2.0.6.tar.xz +6b82763adb2e7d0037b622c7eb92c2e8 lyx-2.0.7.tar.xz