diff --git a/.gitignore b/.gitignore index e4121a5..3324666 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/lyx-2.0.0beta4.tar.xz +/lyx-2.0.0rc1.tar.xz diff --git a/lyx-2.0.0beta3-xdg_open.patch b/lyx-2.0.0beta3-xdg_open.patch deleted file mode 100644 index 6037727..0000000 --- a/lyx-2.0.0beta3-xdg_open.patch +++ /dev/null @@ -1,52 +0,0 @@ -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-2.0.0beta4-gcc46.patch b/lyx-2.0.0beta4-gcc46.patch deleted file mode 100644 index cc63cd1..0000000 --- a/lyx-2.0.0beta4-gcc46.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -up lyx-2.0.0beta4/src/frontends/qt4/GuiIdListModel.cpp.gcc46 lyx-2.0.0beta4/src/frontends/qt4/GuiIdListModel.cpp ---- lyx-2.0.0beta4/src/frontends/qt4/GuiIdListModel.cpp.gcc46 2010-03-11 00:50:36.000000000 -0600 -+++ lyx-2.0.0beta4/src/frontends/qt4/GuiIdListModel.cpp 2011-02-12 12:28:04.773900859 -0600 -@@ -76,9 +76,8 @@ bool GuiIdListModel::insertRows(int row, - if (!rowIsValid(row)) - return false; - vector::iterator it = userData_.begin() + row; -- OurData const v; - beginInsertRows(QModelIndex(), row, row + count - 1); -- userData_.insert(it, count, v); -+ userData_.insert(it, count, OurData()); - endInsertRows(); - return true; - } -diff -up lyx-2.0.0beta4/src/insets/InsetCommandParams.cpp.gcc46 lyx-2.0.0beta4/src/insets/InsetCommandParams.cpp ---- lyx-2.0.0beta4/src/insets/InsetCommandParams.cpp.gcc46 2010-11-01 10:42:09.000000000 -0500 -+++ lyx-2.0.0beta4/src/insets/InsetCommandParams.cpp 2011-02-12 12:30:16.390059475 -0600 -@@ -84,8 +84,9 @@ static ParamInfo const & findInfo(InsetC - default: - LASSERT(false, /**/); - } -- static const ParamInfo pi; -- return pi; // to silence the warning -+ // Below looks like a silliness to me -- Rex -+ //static const ParamInfo pi; -+ //return pi; // to silence the warning - } - - -diff -up lyx-2.0.0beta4/src/mathed/MathData.h.gcc46 lyx-2.0.0beta4/src/mathed/MathData.h ---- lyx-2.0.0beta4/src/mathed/MathData.h.gcc46 2010-03-11 00:50:29.000000000 -0600 -+++ lyx-2.0.0beta4/src/mathed/MathData.h 2011-02-12 12:28:04.775900877 -0600 -@@ -22,6 +22,7 @@ - - #include "support/strfwd.h" - -+#include - #include - - -diff -up lyx-2.0.0beta4/src/support/unicode.h.gcc46 lyx-2.0.0beta4/src/support/unicode.h ---- lyx-2.0.0beta4/src/support/unicode.h.gcc46 2010-03-11 00:50:43.000000000 -0600 -+++ lyx-2.0.0beta4/src/support/unicode.h 2011-02-12 12:28:04.773900859 -0600 -@@ -15,6 +15,7 @@ - - #include "support/strfwd.h" - -+#include - #include - - -diff -up lyx-2.0.0beta4/src/support/weighted_btree.h.gcc46 lyx-2.0.0beta4/src/support/weighted_btree.h ---- lyx-2.0.0beta4/src/support/weighted_btree.h.gcc46 2010-03-11 00:50:42.000000000 -0600 -+++ lyx-2.0.0beta4/src/support/weighted_btree.h 2011-02-12 12:28:04.774900868 -0600 -@@ -29,6 +29,7 @@ - // *** Required Headers from the STL - - #include -+#include - #include - #include - #include diff --git a/lyx-2.0.0rc1-xdg_open.patch b/lyx-2.0.0rc1-xdg_open.patch new file mode 100644 index 0000000..01a493a --- /dev/null +++ b/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'], diff --git a/lyx.spec b/lyx.spec index 19d7400..c46edc9 100644 --- a/lyx.spec +++ b/lyx.spec @@ -1,7 +1,7 @@ ## lyx-fonts %global fontname lyx -%if 1 +%if 1 %define fontpackages 1 BuildRequires: fontpackages-devel %else @@ -10,12 +10,12 @@ BuildRequires: fontpackages-devel %define _without_included_boost --without-included-boost -%define pre beta4 +%define pre rc1 Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 2.0.0 -Release: 0.15.%{pre}%{?dist} +Release: 0.16.%{pre}%{?dist} License: GPLv2+ Group: Applications/Publishing @@ -29,9 +29,7 @@ Source10: lyx.desktop ## upstreamable patches # submitted, but upstream rejected it. we currently agree to disagree. -Patch50: lyx-2.0.0beta3-xdg_open.patch -# gcc46 fix(es) (stddef includes mostly), from svn -Patch51: lyx-2.0.0beta4-gcc46.patch +Patch50: lyx-2.0.0rc1-xdg_open.patch %if 0%{?autotools} BuildRequires: automake libtool @@ -82,6 +80,11 @@ Requires: tetex-IEEEtran # convert doc files to lyx (bug #193858) Requires: wv Requires: xdg-utils +# required for instant preview +# we use a file require because depending on the texlive version used +# the package can either be texlive-dviutils for texlive 2007 or +# texlive-dtl-bin for texlive >= 2010 +Requires: /usr/bin/dv2dt %description LyX is a modern approach to writing documents which breaks with the @@ -120,22 +123,22 @@ Obsoletes: mathml-fonts < 1.0-50 Provides: mathml-fonts = 1.0-50 Obsoletes: lyx-fonts-common < 1.6.5-3 Obsoletes: lyx-fonts-compat < 1.6.5-3 -Obsoletes: lyx-cmex10-fonts < 1.6.5-3 -Obsoletes: lyx-cmmi10-fonts < 1.6.5-3 -Obsoletes: lyx-cmr10-fonts < 1.6.5-3 -Obsoletes: lyx-cmsy10-fonts < 1.6.5-3 -Obsoletes: lyx-esint10-fonts < 1.6.5-3 -Obsoletes: lyx-eufm10-fonts < 1.6.5-3 -Obsoletes: lyx-msam10-fonts < 1.6.5-3 -Obsoletes: lyx-msbm10-fonts < 1.6.5-3 -Obsoletes: lyx-wasy10-fonts < 1.6.5-3 +Obsoletes: lyx-cmex10-fonts < 1.6.5-3 +Obsoletes: lyx-cmmi10-fonts < 1.6.5-3 +Obsoletes: lyx-cmr10-fonts < 1.6.5-3 +Obsoletes: lyx-cmsy10-fonts < 1.6.5-3 +Obsoletes: lyx-esint10-fonts < 1.6.5-3 +Obsoletes: lyx-eufm10-fonts < 1.6.5-3 +Obsoletes: lyx-msam10-fonts < 1.6.5-3 +Obsoletes: lyx-msbm10-fonts < 1.6.5-3 +Obsoletes: lyx-wasy10-fonts < 1.6.5-3 Provides: lyx-cmex10-fonts = %{version}-%{release} Provides: lyx-cmmi10-fonts = %{version}-%{release} Provides: lyx-cmr10-fonts = %{version}-%{release} Provides: lyx-cmsy10-fonts = %{version}-%{release} BuildArch: noarch %description fonts -A collection of Math symbol fonts for %{name}. +A collection of Math symbol fonts for %{name}. %prep @@ -143,7 +146,6 @@ A collection of Math symbol fonts for %{name}. %setup -q -n %{name}-%{version}%{?pre} %patch50 -p1 -b .xdg_open -%patch51 -p1 -b .gcc46 %build @@ -155,7 +157,7 @@ A collection of Math symbol fonts for %{name}. --enable-optimization="%{optflags}" \ --without-included-boost \ --with-enchant \ - --with-hunspell + --with-hunspell make %{?_smp_mflags} @@ -270,7 +272,13 @@ fc-cache %{_fontdir} 2> /dev/null ||: %changelog -* Fri Feb 11 2011 Orion Poplawski 2.0.0.-15.beta4 +* Fri Mar 11 2011 José Matos - 2.0.0-0.16.rc1 +- Update for rc1 and add a dependency to ensure that math instant + preview works by default +- Removed patch applied upstream for gcc 4.6 fixes +- Renamed patch for xdg_open to be in sync with current version (rc1) + +* Fri Feb 11 2011 Orion Poplawski 2.0.0-0.15.beta4 - Get gcc46 fixes from svn * Tue Feb 08 2011 Fedora Release Engineering - 2.0.0-0.14.beta4 @@ -321,7 +329,7 @@ fc-cache %{_fontdir} 2> /dev/null ||: * Thu Jan 21 2010 Rex Dieter - 1.6.5-4 - -fonts: Provides: lyx-{cmex10,cmmi10,cmr10,cmsy10}-fonts -* Sat Jan 16 2010 Rex Dieter - 1.6.5-3 +* Sat Jan 16 2010 Rex Dieter - 1.6.5-3 - rebiuld (boost) - use simple font template diff --git a/sources b/sources index e3386b4..b42899c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1de9673bb1b19084d2dafbf70e2711b lyx-2.0.0beta4.tar.xz +e4a9000c7327c9a55ba623678548d118 lyx-2.0.0rc1.tar.xz