latest version, explicitly expand the configure time autodetects

This commit is contained in:
Caolan McNamara 2009-06-22 10:59:53 +00:00
parent 3fad914f5f
commit 0898a4e999
2 changed files with 33 additions and 5 deletions

View File

@ -0,0 +1,23 @@
diff -ru enchant-1.5.0.orig/src/enchant.c enchant-1.5.0/src/enchant.c
--- enchant-1.5.0.orig/src/enchant.c 2009-06-22 11:53:16.000000000 +0100
+++ enchant-1.5.0/src/enchant.c 2009-06-22 11:53:39.000000000 +0100
@@ -232,6 +232,9 @@
if (module_dir)
module_dirs = enchant_slist_append_unique_string (module_dirs, module_dir);
+#if defined(ENCHANT_GLOBAL_MODULE_DIR)
+ module_dirs = enchant_slist_append_unique_string (module_dirs, g_strdup (ENCHANT_GLOBAL_MODULE_DIR));
+#else
/* Dynamically locate library and search for modules relative to it. */
prefix = enchant_get_prefix_dir();
if(prefix)
@@ -240,9 +243,6 @@
g_free(prefix);
module_dirs = enchant_slist_append_unique_string (module_dirs, module_dir);
}
-
-#if defined(ENCHANT_GLOBAL_MODULE_DIR)
- module_dirs = enchant_slist_append_unique_string (module_dirs, g_strdup (ENCHANT_GLOBAL_MODULE_DIR));
#endif
return module_dirs;

View File

@ -1,7 +1,7 @@
Summary: An Enchanting Spell Checking Library
Name: enchant
Version: 1.4.2
Release: 5%{?dist}
Version: 1.5.0
Release: 1%{?dist}
Epoch: 1
Group: System Environment/Libraries
License: LGPLv2+
@ -9,12 +9,14 @@ Source: http://www.abisource.com/downloads/enchant/%{version}/enchant-%{version}
URL: http://www.abisource.com/
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
#http://bugzilla.abisource.com/show_bug.cgi?id=12160
Patch0: enchant-1.5.0-abi12160.searchdirs.patch
%description
A library that wraps other spell checking backends.
@ -46,9 +48,10 @@ Libraries, headers, and support files necessary to compile applications using li
%prep
%setup -q
%patch0 -p1 -b .searchdirs
%build
%configure --disable-ispell --with-myspell-dir=/usr/share/myspell --disable-hspell --disable-static
%configure --enable-myspell --with-myspell-dir=/usr/share/myspell --disable-static --disable-ispell --disable-hspell --disable-zemberek
make %{?_smp_mflags}
%install
@ -63,7 +66,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/enchant/*.la
%{_bindir}/*
%{_libdir}/lib*.so.*
%dir %{_libdir}/enchant
# %{_libdir}/enchant/lib*hspell.so*
%{_libdir}/enchant/lib*myspell.so*
%{_mandir}/man1/enchant.1.gz
%{_datadir}/enchant
@ -88,6 +90,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/enchant/*.la
rm -r $RPM_BUILD_ROOT
%changelog
* Mon Jun 22 2009 Caolán McNamara <caolanm@redhat.com> 1:1.5.0-1
- latest version
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.4.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild