diff --git a/lyx-2.0.0-hunspell_pkgconfig.patch b/lyx-2.0.0-hunspell_pkgconfig.patch deleted file mode 100644 index 16f656a..0000000 --- a/lyx-2.0.0-hunspell_pkgconfig.patch +++ /dev/null @@ -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 diff --git a/lyx.spec b/lyx.spec index 5f70594..b27c6a8 100644 --- a/lyx.spec +++ b/lyx.spec @@ -12,13 +12,13 @@ BuildRequires: fontpackages-devel Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx -Version: 2.0.0 -Release: 5%{?dist} +Version: 2.0.1 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Publishing Url: http://www.lyx.org/ -Source0: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.xz +Source0: ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: lyxrc.dist @@ -27,9 +27,8 @@ Source10: lyx.desktop ## upstreamable patches # submitted, but upstream rejected it. we currently agree to disagree. Patch50: lyx-2.0.0rc1-xdg_open.patch -# hunspell pkgconfig support -%global autotools 1 -Patch51: lyx-2.0.0-hunspell_pkgconfig.patch +# Do we need to rebuild configuration files? +%global autotools 0 %if 0%{?autotools} BuildRequires: automake libtool @@ -146,7 +145,6 @@ A collection of Math symbol fonts for %{name}. %setup -q -n %{name}-%{version} %patch50 -p1 -b .xdg_open -%patch51 -p1 -b .hunspell_pkgconfig %if 0%{?autotools} ./autogen.sh @@ -276,6 +274,9 @@ fc-cache %{_fontdir} 2> /dev/null ||: %changelog +* Mon Sep 5 2011 José Matos - 2.0.1-1 +- Update to 2.0.1 + * Thu Jul 21 2011 Rex Dieter 2.0.0-5 - rebuild (boost) diff --git a/sources b/sources index c55e6bb..d850068 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -005dc04ad01e1b2bd92ec86b6235f8b1 lyx-2.0.0.tar.xz +cdd60ce1c5a81ed878a5dca6f5db1543 lyx-2.0.1.tar.xz