- New upstream release

- Add voikko support in an enchant-voikko package
- Bump glib-devel BR to 2.6.0
This commit is contained in:
Marc Maurer 2008-05-21 15:45:41 +00:00
parent 17b89af1e9
commit 66903ddf25
2 changed files with 21 additions and 74 deletions

View File

@ -1,64 +0,0 @@
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
-

View File

@ -1,21 +1,20 @@
Summary: An Enchanting Spell Checking Library
Name: enchant
Version: 1.3.0
Release: 4%{?dist}
Version: 1.4.2
Release: 1%{?dist}
Epoch: 1
Group: System Environment/Libraries
License: LGPLv2+
Source: http://www.abisource.com/downloads/enchant/%{version}/enchant-%{version}.tar.gz
URL: http://www.abisource.com/
BuildRequires: glib2-devel >= 2.0.0
BuildRequires: glib2-devel >= 2.6.0
BuildRequires: aspell-devel
# BuildRequires: hspell-devel
BuildRequires: hunspell-devel
BuildRequires: libvoikko-devel
BuildRequires: automake, libtool
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Patch0: enchant-1.3.0-systemhunspell.patch
%description
A library that wraps other spell checking backends.
@ -27,6 +26,15 @@ Requires: enchant = %{epoch}:%{version}-%{release}
%description aspell
Libraries necessary to integrate applications using libenchant with aspell.
%package voikko
Summary: Integration with voikko for libenchant
Group: System Environment/Libraries
Requires: enchant = %{epoch}:%{version}-%{release}
%description voikko
Libraries necessary to integrate applications using libenchant with voikko.
%package devel
Summary: Support files necessary to compile applications with libenchant.
Group: Development/Libraries
@ -38,11 +46,6 @@ Libraries, headers, and support files necessary to compile applications using li
%prep
%setup -q
%patch0 -p1 -b .enchant-1.3.0-systemhunspell.patch
aclocal
autoconf
automake --foreign
rm -f ./src/myspell/hunspell.hxx
%build
%configure --disable-ispell --with-myspell-dir=/usr/share/myspell --disable-hspell
@ -68,6 +71,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/enchant/*.la
%files aspell
%{_libdir}/enchant/lib*aspell.so*
%files voikko
%{_libdir}/enchant/lib*_voikko.so*
%files devel
%defattr(-,root,root)
%{_libdir}/*.a
@ -84,6 +90,11 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/enchant/*.la
rm -r $RPM_BUILD_ROOT
%changelog
* Wed May 21 2008 Marc Maurer <uwog@abisource.com> 1:1.4.2-1
- New upstream release
- Add voikko support in an enchant-voikko package
- Bump glib-devel BR to 2.6.0
* Fri Feb 08 2008 Caolan McNamara <caolanm@redhat.com> 1:1.3.0-4.fc9
- minor cockup