updated to 2.0.1

OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=30
This commit is contained in:
Cor Blom 2011-09-05 18:12:16 +00:00 committed by Git OBS Bridge
parent 05ecfcced4
commit 7da8a8143f
6 changed files with 39 additions and 70 deletions

View File

@ -1,48 +0,0 @@
diff -up lyx-2.0.0/config/spell.m4.hunspell_pkgconfig lyx-2.0.0/config/spell.m4
--- lyx-2.0.0/config/spell.m4.hunspell_pkgconfig 2011-03-27 16:25:24.000000000 -0500
+++ lyx-2.0.0/config/spell.m4 2011-05-26 10:48:17.539534155 -0500
@@ -51,11 +51,7 @@ AC_DEFUN([CHECK_WITH_HUNSPELL],
test "$with_hunspell" = "no" && lyx_use_hunspell=false
if $lyx_use_hunspell ; then
- AC_CHECK_HEADERS(hunspell/hunspell.hxx,
- [AC_SEARCH_LIBS(Hunspell_spell,
- [hunspell hunspell-1.2],, [lyx_use_hunspell=false])],
- [lyx_use_hunspell=false])
- fi
+ PKG_CHECK_MODULES([HUNSPELL], [hunspell], [], [lyx_use_hunspell=false])
AC_MSG_CHECKING([whether to use hunspell])
if $lyx_use_hunspell ; then
AC_MSG_RESULT(yes)
@@ -64,7 +60,8 @@ AC_DEFUN([CHECK_WITH_HUNSPELL],
else
AC_MSG_RESULT(no)
fi
- ])
+ fi
+ ])
### Check if we want spell libraries, prefer new aspell or hunspell
diff -up lyx-2.0.0/src/HunspellChecker.cpp.hunspell_pkgconfig lyx-2.0.0/src/HunspellChecker.cpp
diff -up lyx-2.0.0/src/Makefile.am.hunspell_pkgconfig lyx-2.0.0/src/Makefile.am
--- lyx-2.0.0/src/Makefile.am.hunspell_pkgconfig 2011-02-10 18:02:05.000000000 -0600
+++ lyx-2.0.0/src/Makefile.am 2011-05-26 10:51:37.282467840 -0500
@@ -4,7 +4,7 @@ include $(top_srcdir)/config/common.am
DISTCLEANFILES += libintl.h
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS)
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS)
AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES)
if BUILD_CLIENT_SUBDIR
@@ -16,7 +16,7 @@ SUBDIRS = support frontends . $(CLIENT)
EXTRA_DIST = pch.h
OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) \
- $(ENCHANT_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
+ $(ENCHANT_LIBS) $(HUNSPELL_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
noinst_LIBRARIES = liblyxcore.a
bin_PROGRAMS = lyx

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:466424b21a33c9e465ea8761ebf1dba1bf5d1eb7894f3cff21c25b701f597a1f
size 18376007

View File

@ -1,7 +1,6 @@
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 @@
--- lib/configure.py.orig 2011-08-15 11:05:05.000000000 +0200
+++ lib/configure.py 2011-08-15 13:29:56.691000026 +0200
@@ -503,7 +503,7 @@
checkViewerEditor('a SVG viewer and editor', ['inkscape'],
rc_entry = [r'\Format svg svg SVG "" "%%" "%%" "vector"'])
#
@ -10,30 +9,30 @@ diff -ur lyx-2.0.0rc1.orig/lib/configure.py lyx-2.0.0rc1/lib/configure.py
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"'''])
@@ -566,7 +566,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 @@
@@ -580,11 +580,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"'''])
\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', ['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 @@
@@ -592,14 +592,14 @@
\Format pdf4 pdf "PDF (XeTeX)" X "%%" "" "document,vector,menu=export"
\Format pdf5 pdf "PDF (LuaTeX)" u "%%" "" "document,vector,menu=export"'''])
#

3
lyx-2.0.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9349359e0df8da414f3a973647d6d095b729ceef0b469640bff724e673a8e9a8
size 18613212

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Mon Sep 5 18:04:22 UTC 2011 - cornelis@solcon.nl
- Update to 2.0.1:
* Improved support for external files in ERT
* Improved XHTML output of various fractions
* A prefix for the TEXINPUTS environment variable can be specified in the
preferences
* Updated templates to current LyX format
* Allow LaTeX import of \uline (bug 7640)
* Fix compilation error occurring when a LyX document resides in a directory
whose name contains characters that are special to LaTeX (bug 6170)
* Updated translations
* Menu View->Source for documents with XHTML default output format now displays
only the current paragraph, except when complete source is requested
(bug 7463)
* Enable "Accept compound" preference setting for Aspell backend only
* Updated documentation
* Bugfixes
* For more details see http://www.lyx.org/announce/2_0_1.txt or included ANNOUNCE file
- removed lyx-2.0.0-hunspell_pkgconfig.patch (part of 2.0.1)
-------------------------------------------------------------------
Thu Aug 25 19:13:47 UTC 2011 - cornelis@solcon.nl

View File

@ -25,20 +25,17 @@ License: LGPLv2.1+
Group: Productivity/Publishing/TeX/Frontends
Requires: texlive-latex ImageMagick
AutoReqProv: on
Version: 2.0.0
Release: 6
Version: 2.0.1
Release: 1
Summary: LaTeX-Based WYSIWYG Editor
Url: http://www.lyx.org/
Source: ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-2.0.0.tar.gz
Source: ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-2.0.1.tar.gz
Source1: lyx.desktop
Source2: lyx.png
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 patch
# 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
Patch0: lyx-2.0.1-xdg_open.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: texlive-xetex xindy
@ -52,8 +49,7 @@ each paragraph. Of course, low level formatting is still possible.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1
%patch0
# Remove build time references so build-compare can do its work
FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M')
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')