From f51445daca15d1a429da468da7e23bde7ae72f50 Mon Sep 17 00:00:00 2001 From: José Matos Date: Mar 14 2018 13:55:12 +0000 Subject: Rebuild for 2.3.0 --- diff --git a/.gitignore b/.gitignore index 438a39d..59921d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ clog -/lyx-2.2.2.tar.xz -/lyx-2.2.3.tar.xz +/lyx-2.3.0.tar.xz diff --git a/lyx-2.2.2-xdg_open.patch b/lyx-2.2.2-xdg_open.patch deleted file mode 100644 index 723f9d9..0000000 --- a/lyx-2.2.2-xdg_open.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -ur a/lib/configure.py b/lib/configure.py ---- a/lib/configure.py 2016-10-10 16:42:40.000000000 +0100 -+++ b/lib/configure.py 2016-10-12 11:35:40.602241885 +0100 -@@ -595,7 +595,7 @@ - \Format tiff tif TIFF "" "%s" "%s" "" "image/tiff" - \Format xbm xbm XBM "" "%s" "%s" "" "image/x-xbitmap" - \Format xpm xpm XPM "" "%s" "%s" "" "image/x-xpixmap"''' -- path, iv = checkViewerNoRC('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'], rc_entry = [imageformats]) -+ path, iv = checkViewerNoRC('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp-remote', 'gimp'], rc_entry = [imageformats]) - path, ie = checkEditorNoRC('a raster image editor', ['gimp-remote', 'gimp'], rc_entry = [imageformats]) - addToRC(imageformats % \ - (iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie) ) -@@ -636,7 +636,7 @@ - \Format html_table html "HTML Table (for spreadsheets)" "" "" "%%" "document" "text/html" - \Format oocalc ods "OpenDocument spreadsheet" "" "" "%%" "document" "application/vnd.oasis.opendocument.spreadsheet"''']) - # -- 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 xhtml xhtml "LyXHTML" y "%%" "" "document,menu=export" "application/xhtml+xml"']) - # - checkEditor('a BibTeX editor', ['jabref', 'JabRef', \ -@@ -649,14 +649,14 @@ - # - #checkProg('a Postscript interpreter', ['gs'], - # rc_entry = [ r'\ps_command "%%"' ]) -- checkViewer('a Postscript previewer', ['kghostview', 'okular', 'qpdfview --unique', 'evince', 'gv', 'ghostview -swap', 'gsview64', 'gsview32'], -+ checkViewer('a Postscript previewer', ['xdg-open', 'kghostview', 'okular', 'qpdfview --unique', 'evince', 'gv', 'ghostview -swap', 'gsview64', 'gsview32'], - rc_entry = [r'''\Format eps eps EPS "" "%%" "" "vector" "image/x-eps" - \Format eps2 eps "EPS (uncropped)" "" "%%" "" "vector" "" - \Format eps3 eps "EPS (cropped)" "" "%%" "" "document" "" - \Format ps ps Postscript t "%%" "" "document,vector,menu=export" "application/postscript"''']) - # for xdg-open issues look here: http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg151818.html - # the MIME type is set for pdf6, because that one needs to be autodetectable by libmime -- checkViewer('a PDF previewer', ['pdfview', 'kpdf', 'okular', 'qpdfview --unique', 'evince', 'kghostview', 'xpdf', 'SumatraPDF', 'acrobat', 'acroread', 'mupdf', \ -+ checkViewer('a PDF previewer', ['xdg-open', 'pdfview', 'kpdf', 'okular', 'qpdfview --unique', 'evince', 'kghostview', 'xpdf', 'SumatraPDF', 'acrobat', 'acroread', 'mupdf', \ - 'gv', 'ghostview', 'AcroRd32', 'gsview64', 'gsview32'], - rc_entry = [r'''\Format pdf pdf "PDF (ps2pdf)" P "%%" "" "document,vector,menu=export" "" - \Format pdf2 pdf "PDF (pdflatex)" F "%%" "" "document,vector,menu=export" "" -@@ -667,14 +667,14 @@ - \Format pdf7 pdf "PDF (cropped)" "" "%%" "" "document,vector" "" - \Format pdf8 pdf "PDF (lower resolution)" "" "%%" "" "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,menu=export" "application/x-dvi" - \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, htm" HTML H "%%" "" "document,menu=export" "text/html"']) - # - checkViewerEditor('Noteedit', ['noteedit'], diff --git a/lyx-2.3.0-xdg_open.patch b/lyx-2.3.0-xdg_open.patch new file mode 100644 index 0000000..0e8ee60 --- /dev/null +++ b/lyx-2.3.0-xdg_open.patch @@ -0,0 +1,57 @@ +diff -ur a/lib/configure.py b/lib/configure.py +--- a/lib/configure.py 2018-02-25 00:11:17.000000000 +0000 ++++ b/lib/configure.py 2018-02-25 10:13:08.868621022 +0000 +@@ -628,7 +628,7 @@ + \Format xbm xbm XBM "" "%s" "%s" "" "image/x-xbitmap" + \Format xpm xpm XPM "" "%s" "%s" "" "image/x-xpixmap"''' + path, iv = checkViewerNoRC('a raster image viewer', +- ['xv', 'gwenview', 'kview', ++ ['xdg-open','xv', 'gwenview', 'kview', + 'eog', 'xviewer', 'ristretto', 'gpicview', 'lximage-qt', + 'xdg-open', 'gimp-remote', 'gimp'], + rc_entry = [imageformats]) +@@ -677,7 +677,7 @@ + \Format html_table html "HTML Table (for spreadsheets)" "" "" "%%" "document" "text/html" + \Format oocalc ods "OpenDocument spreadsheet" "" "" "%%" "document" "application/vnd.oasis.opendocument.spreadsheet"''']) + # +- 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 xhtml xhtml "LyXHTML" y "%%" "" "document,menu=export" "application/xhtml+xml"']) + # + checkEditor('a BibTeX editor', ['jabref', 'JabRef', +@@ -691,7 +691,7 @@ + #checkProg('a Postscript interpreter', ['gs'], + # rc_entry = [ r'\ps_command "%%"' ]) + checkViewer('a Postscript previewer', +- ['kghostview', 'okular', 'qpdfview --unique', ++ ['xdg-open','kghostview', 'okular', 'qpdfview --unique', + 'evince', 'xreader', + 'gv', 'ghostview -swap', 'gsview64', 'gsview32'], + rc_entry = [r'''\Format eps eps EPS "" "%%" "" "vector" "image/x-eps" +@@ -702,7 +702,7 @@ + # maybe use "bestApplication()" from https://github.com/jleclanche/python-mime + # the MIME type is set for pdf6, because that one needs to be autodetectable by libmime + checkViewer('a PDF previewer', +- ['pdfview', 'kpdf', 'okular', 'qpdfview --unique', ++ ['xdg-open','pdfview', 'kpdf', 'okular', 'qpdfview --unique', + 'evince', 'xreader', 'kghostview', 'xpdf', 'SumatraPDF', + 'acrobat', 'acroread', 'mupdf', + 'gv', 'ghostview', 'AcroRd32', 'gsview64', 'gsview32'], +@@ -715,7 +715,7 @@ + \Format pdf7 pdf "PDF (cropped)" "" "%%" "" "document,vector" "" + \Format pdf8 pdf "PDF (lower resolution)" "" "%%" "" "document,vector" ""''']) + # +- checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', ++ checkViewer('a DVI previewer', ['xdg-open','xdvi', 'kdvi', 'okular', + 'evince', 'xreader', + 'yap', 'dviout -Set=!m'], + rc_entry = [r'''\Format dvi dvi DVI D "%%" "" "document,vector,menu=export" "application/x-dvi" +@@ -724,7 +724,7 @@ + # 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, htm" HTML H "%%" "" "document,menu=export" "text/html"']) + # + checkViewerEditor('Noteedit', ['noteedit'], diff --git a/lyx.spec b/lyx.spec index 01d42e6..645ca1e 100644 --- a/lyx.spec +++ b/lyx.spec @@ -13,12 +13,12 @@ BuildRequires: fontpackages-devel %global use_qt5 1 Name: lyx -Version: 2.2.3 -Release: 7%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Summary: WYSIWYM (What You See Is What You Mean) document processor License: GPLv2+ Url: http://www.lyx.org/ -Source0: ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-%{version}.tar.xz +Source0: ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-%{version}.tar.xz Source1: lyxrc.dist @@ -27,7 +27,7 @@ Source20: %{fontname}.metainfo.xml ## upstreamable patches # submitted, but upstream rejected it. we currently agree to disagree. -Patch50: lyx-2.2.2-xdg_open.patch +Patch50: lyx-2.3.0-xdg_open.patch Obsoletes: %{name}-qt < 1.5.0 Provides: %{name}-qt = %{version}-%{release} @@ -44,6 +44,7 @@ BuildRequires: bc BuildRequires: boost-devel %endif +BuildRequires: gcc-c++ BuildRequires: desktop-file-utils BuildRequires: enchant-devel BuildRequires: file-devel @@ -276,6 +277,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : %Changelog +* Sun Feb 25 2018 José Matos - 2.3.0-0 +- Rebuild for 2.3.0 + * Thu Feb 08 2018 Fedora Release Engineering - 2.2.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 29c3cb1..3f6f5ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lyx-2.2.3.tar.xz) = b5a4a16b22680022651a0f3911c2c24bcd3541a573e672e541cb0af6572089e4b0e0ec1cafb40850e75c377e7da5b286d0314886e0c57d55f57645d8e4a07708 +SHA512 (lyx-2.3.0.tar.xz) = 77366d365f600069564b6d508ba2169744bbc7bc4dc9cb7e9d5f44941796dd7a027ca9ad08f5a67fd6863cbd1f6308ce5233b6e8685ebc6cf78ed19eef84ccb5