From f390ea6562512d125da6259179fa651aad5e9499 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@fedoraproject.org>
Date: Oct 09 2008 05:59:44 +0000
Subject: Merge from devel


---

diff --git a/.cvsignore b/.cvsignore
index faeaae5..45fb239 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-enchant-1.3.0.tar.gz
+enchant-1.4.2.tar.gz
diff --git a/enchant.spec b/enchant.spec
index ab55dcc..0761961 100644
--- a/enchant.spec
+++ b/enchant.spec
@@ -1,20 +1,54 @@
+%if %{?el5}0
+%define with_libvoikko  %{?_with_libvoikko:    1} %{?!_with_libvoikko:    0}
+%define with_hunspell   %{?_with_hunspell:     1} %{?!_with_hunspell:     0}
+%else
+%define with_libvoikko  %{?_without_libvoikko: 0} %{?!_without_libvoikko: 1}
+%define with_hunspell   %{?_without_hunspell:  0} %{?!_without_hunspell:  1}
+%endif
+
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.3.0
-Release: 1%{?dist}
+Version: 1.4.2
+Release: 4%{?dist}.1
 Epoch: 1
 Group: System Environment/Libraries
-License: LGPL
+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: hspell-devel
+%if %{with_hunspell}
+BuildRequires: hunspell-devel
+%endif
+%if %{with_libvoikko}
+BuildRequires: libvoikko-devel
+%endif
+BuildRequires: automake, libtool
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %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.
+
+%if %{with_libvoikko}
+%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.
+%endif
+
+
 %package devel
 Summary: Support files necessary to compile applications with libenchant.
 Group: Development/Libraries
@@ -28,7 +62,15 @@ Libraries, headers, and support files necessary to compile applications using li
 %setup -q
 
 %build
-%configure --disable-ispell
+%configure --disable-ispell --with-myspell-dir=/usr/share/myspell --disable-hspell --disable-static \
+  --disable-zemberek \
+%if ! %{with_hunspell}
+  --disable-hunspell \
+%endif
+%if ! %{with_libvoikko}
+  --disable-libvoikko \
+%endif
+  --
 make %{?_smp_mflags}
 
 %install
@@ -43,15 +85,23 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/enchant/*.la
 %{_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*
+
+%if %{with_libvoikko}
+%files voikko
+%defattr(-,root,root)
+%{_libdir}/enchant/lib*_voikko.so*
+%endif
+
 %files devel
 %defattr(-,root,root)
-%{_libdir}/*.a
 %{_libdir}/*.so
-%{_libdir}/enchant/*.a
 %{_libdir}/pkgconfig/enchant.pc
 %{_includedir}/enchant
 
@@ -63,6 +113,34 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/enchant/*.la
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Oct 3 2008 Lubomir Rintel <lkundrak@v3.sk> 1:1.4.2-4.1
+- Make libvoikko and hunspell support optional and disabled for el5
+
+* Sat Jul 26 2008 Michael Schwendt <mschwendt@fedoraproject.org> 1:1.4.2-4
+- Rebuild for ABI-incompatible hunspell-1.2.4.2-2.fc10
+
+* Thu Jul 10 2008 Marc Maurer <uwog@abisource.com> 1:1.4.2-3
+- Fix 426712: don't build static libs (patch from Michael Schwendt)
+
+* Wed May 21 2008 Marc Maurer <uwog@abisource.com> 1:1.4.2-2
+- Rebuild
+
+* 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
+
+* Sat Jan 26 2008 Caolan McNamara <caolanm@redhat.com> 1:1.3.0-3.fc9
+- Resolves: rhbz#426402 use system hunspell not internal one and 
+  split out aspell backend.
+- See: rhbz#430354 hspell backend disabled until pic issue fixed
+
+* Wed Dec 19 2007 Caolan McNamara <caolanm@redhat.com> 1:1.3.0-2.fc9
+- tell enchant where the myspell dictionaries are
+
 * Thu Oct 12 2006 Marc Maurer <uwog@abisource.com> 1:1.3.0-1.fc6
 - Update to 1.3.0
 
diff --git a/sources b/sources
index ca6ac2b..fe038cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f7edafae875616b83e7a17a7e5c2d585  enchant-1.3.0.tar.gz
+fe4558269ff59f569ab9581c907d58cb  enchant-1.4.2.tar.gz