Attachment 290185 Details for Bug 426402 – patch

[patch] patch

system.hunspell.patch (text/plain), 4.05 KB, created by Caolan McNamara on 2007-12-20 19:59:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolan McNamara

Created: 2007-12-20 19:59:43 UTC

Size: 4.05 KB

patch

obsolete

>Index: enchant.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/enchant/devel/enchant.spec,v
>retrieving revision 1.14
>diff -u -r1.14 enchant.spec
>--- enchant.spec	19 Dec 2007 20:36:44 -0000	1.14
>+++ enchant.spec	20 Dec 2007 19:49:37 -0000
>@@ -1,7 +1,7 @@
> Summary: An Enchanting Spell Checking Library
> Name: enchant
> Version: 1.3.0
>-Release: 2%{?dist}
>+Release: 3%{?dist}
> Epoch: 1
> Group: System Environment/Libraries
> License: LGPL
>@@ -10,11 +10,23 @@
> BuildRequires: glib2-devel >= 2.0.0
> BuildRequires: aspell-devel
> BuildRequires: hspell-devel
>+BuildRequires: hunspell-devel
>+BuildRequires: automake
> BuildRoot: %{_tmppath}/%{name}-%{version}-root
> 
>+Patch0: enchant-1.3.0-systemhunspell.patch
>+
> %description
> A library that wraps other spell checking backends.
> 
>+%package aspell
>+Summary: Integration with aspell for libenchant
>+Group: System Environment/Libraries
>+Requires: enchant = %{epoch}:%{version}-%{release}
>+
>+%description aspell
>+Libraries necessary to integrate applications using libenchant with aspell.
>+
> %package devel
> Summary: Support files necessary to compile applications with libenchant.
> Group: Development/Libraries
>@@ -26,6 +38,10 @@
> 
> %prep
> %setup -q
>+%patch0 -p1 -b .enchant-1.3.0-systemhunspell.patch
>+aclocal
>+autoconf
>+automake --foreign
> 
> %build
> %configure --disable-ispell --with-myspell-dir=/usr/share/myspell
>@@ -43,10 +59,14 @@
> %{_bindir}/*
> %{_libdir}/lib*.so.*
> %dir %{_libdir}/enchant
>-%{_libdir}/enchant/lib*.so*
>+%{_libdir}/enchant/lib*hspell.so*
>+%{_libdir}/enchant/lib*myspell.so*
> %{_mandir}/man1/enchant.1.gz
> %{_datadir}/enchant
> 
>+%files aspell
>+%{_libdir}/enchant/lib*aspell.so*
>+
> %files devel
> %defattr(-,root,root)
> %{_libdir}/*.a
>@@ -63,6 +83,9 @@
> rm -r $RPM_BUILD_ROOT
> 
> %changelog
>+* Thu Dec 20 2007 Caolan McNamara <caolanm@redhat.com> 1:1.3.0-3.fc9
>+- split out aspell backend and use system hunspell
>+
> * Wed Dec 19 2007 Caolan McNamara <caolanm@redhat.com> 1:1.3.0-2.fc9
> - tell enchant where the myspell dictionaries are
> 
>--- /dev/null	2007-12-06 18:06:55.610017536 +0000
>+++ enchant-1.3.0-systemhunspell.patch	2007-12-20 19:49:20.000000000 +0000
>@@ -0,0 +1,64 @@
>+diff -ru enchant-1.3.0.orig/configure.in enchant-1.3.0/configure.in
>+--- enchant-1.3.0.orig/configure.in	2006-07-22 18:34:46.000000000 +0100
>++++ enchant-1.3.0/configure.in	2007-12-20 19:25:18.000000000 +0000
>+@@ -85,7 +85,6 @@
>+ dnl ===========================================================================
>+ 
>+ dnl binreloc
>+-AM_BINRELOC
>+ AM_CONDITIONAL(WITH_BINRELOC, test "x$br_cv_binreloc" = "xyes")
>+ 
>+ build_ispell=yes
>+@@ -123,11 +122,8 @@
>+    myspell_dir=$with_myspell_dir
>+ fi
>+ 
>++PKG_CHECK_MODULES(MYSPELL, hunspell)
>+ MYSPELL_CFLAGS="$MYSPELL_CFLAGS -DENCHANT_MYSPELL_DICT_DIR='\"$myspell_dir\"'"
>+-if test "x$with_system_myspell" != "xno"; then
>+-   MYSPELL_CFLAGS="$MYSPELL_CFLAGS -DWITH_SYSTEM_MYSPELL=1"
>+-fi
>+-
>+ AC_SUBST(MYSPELL_CFLAGS)
>+ AC_SUBST(MYSPELL_LIBS)
>+ 
>+diff -ru enchant-1.3.0.orig/src/myspell/Makefile.am enchant-1.3.0/src/myspell/Makefile.am
>+--- enchant-1.3.0.orig/src/myspell/Makefile.am	2006-07-22 18:01:40.000000000 +0100
>++++ enchant-1.3.0/src/myspell/Makefile.am	2007-12-20 19:17:02.000000000 +0000
>+@@ -10,35 +10,8 @@
>+ myspelldir= $(libdir)/enchant
>+ 
>+ libenchant_myspell_lalibdir=$(libdir)/enchant
>+-libenchant_myspell_la_LIBADD= $(MYSPELL_LIBS) $(ENCHANT_LIBS) $(top_builddir)/src/libenchant.la
>++libenchant_myspell_la_LIBADD= $(MYSPELL_LIBS) $(ENCHANT_LIBS) $(top_builddir)/src/libenchant.la
>+ libenchant_myspell_la_LDFLAGS = -module -avoid-version -no-undefined
>+ 
>+ libenchant_myspell_la_SOURCES =	\
>+-	affentry.hxx		\
>+-	affixmgr.hxx		\
>+-	atypes.hxx		\
>+-	baseaffix.hxx		\
>+-	csutil.hxx		\
>+-	dictmgr.hxx		\
>+-	hashmgr.hxx		\
>+-	htypes.hxx		\
>+-	hunspell.hxx		\
>+-	langnum.hxx		\
>+-	suggestmgr.hxx		\
>+-	affentry.cxx		\
>+-	affixmgr.cxx		\
>+-	csutil.cxx		\
>+-	dictmgr.cxx		\
>+-	hashmgr.cxx		\
>+-	hunspell.cxx		\
>+-	suggestmgr.cxx		\
>+ 	myspell_checker.cpp
>+-
>+-EXTRA_DIST=			\
>+-	license.readme		\
>+-	utf_info.cxx		\
>+-	license.hunspell	\
>+-	license.myspell		\
>+-	license.readme		\
>+-	hunspell.dsp
>+-

Actions: View | Diff

Attachments on bug 426402: 290185