rpms/enchant/devel enchant-1.3.0-systemhunspell.patch,NONE,1.1

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3259

Added Files:
	enchant-1.3.0-systemhunspell.patch 
Log Message:
Resolves: rhbz#426402 use system hunspell

enchant-1.3.0-systemhunspell.patch:

--- NEW FILE enchant-1.3.0-systemhunspell.patch ---
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=$(ENCHANT_LIBS) $(MYSPELL_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
-