commit 6396d84bb1e9e6898a99dbc113dee858f017e74f
Author: Marcin Banasiak <>
Date:   Mon Mar 12 21:44:46 2018 +0100

    Update to 2.2.3 (packaged as enchant2; parallel installable with enchant 

 enchant.spec => enchant2.spec | 133 ++++++++++++++++--------------------------
 hunspell-1.4.patch            |  21 -------
 2 files changed, 51 insertions(+), 103 deletions(-)
diff --git a/enchant.spec b/enchant2.spec
similarity index 68%
rename from enchant.spec
rename to enchant2.spec
index 7e1fe38..450fd31 100644
--- a/enchant.spec
+++ b/enchant2.spec
@@ -4,25 +4,24 @@
 Summary:       libenchant - generic spell checking library
 Summary(pl.UTF-8):     libenchant - ogólna biblioteka sprawdzania pisowni
-Name:          enchant
-Version:       1.6.0
-Release:       7
-License:       LGPL v2
+Name:          enchant2
+Version:       2.2.3
+Release:       1
+License:       LGPL v2+
 Group:         Libraries
-# Source0-md5: de11011aff801dc61042828041fb59c7
-Patch0:                hunspell-1.4.patch
+# Source0-md5: 4b8abb58e00e93363591b3f5ea4f52d5
 BuildRequires: aspell-devel >= 2:0.50.0
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: dbus-glib-devel >= 0.62
 BuildRequires: glib2-devel >= 1:2.12.0
 BuildRequires: hspell-devel >= 0.9-3
+BuildRequires: hunspell-devel
 BuildRequires: libtool
 BuildRequires: libvoikko-devel
 BuildRequires: pkgconfig
-BuildRequires: uspell-devel >= 1.1.0
 Requires:      glib2 >= 1:2.12.0
 Suggests:      %{name}-backend
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -32,7 +31,7 @@ This project aims to provide an efficient, extensible 
abstraction for
 dealing with different spell checking libraries. Enchant is meant to
 provide a generic interface into various existing spell checking
 libraries. These include, but are not limited to: Aspell/Pspell,
-Ispell, Hspell, Uspell.
+Hunspell, Hspell.
 Enchant is also meant to be used in a cross-platform environment. Part
 of this means that Enchant wants to limit its number of external
@@ -52,7 +51,7 @@ preference to the $USER resources, when found.
 Celem projektu jest dostarczenie wydajnej i rozszerzalnej abstrakcji
 do obsługi różnych bibliotek kontroli pisowni. Enchant ma dostarczać
 ogólny interfejs do różnych istniejących bibliotek. Obejmują one (ale
-nie są ograniczone do): Aspella/Pspella, Ispella, Hspella, Uspella.
+nie są ograniczone do): Aspella/Pspella, Hunspella, Hspella.
 Enchant ma być także używany w środowisku wieloplatformowym. Oznacza
 to między innymi, że Enchant ma mieć ograniczoną liczbę zewnętrznych
@@ -121,44 +120,18 @@ hspell provider module for Enchant.
 %description hspell -l pl.UTF-8
 Moduł obsługujący hspella dla Enchanta.
-%package ispell
-Summary:       ispell provider module for Enchant
-Summary(pl.UTF-8):     Moduł obsługujący ispella dla Enchanta
+%package hunspell
+Summary:       hunspell provider module for Enchant
+Summary(pl.UTF-8):     Moduł obsługujący hunspella dla Enchanta
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
 Provides:      %{name}-backend
-%description ispell
-ispell provider module for Enchant.
+%description hunspell
+hunspell provider module for Enchant.
-%description ispell -l pl.UTF-8
-Moduł obsługujący ispella dla Enchanta.
-%package myspell
-Summary:       myspell provider module for Enchant
-Summary(pl.UTF-8):     Moduł obsługujący myspella dla Enchanta
-Group:         Libraries
-Requires:      %{name} = %{version}-%{release}
-Provides:      %{name}-backend
-%description myspell
-myspell provider module for Enchant.
-%description myspell -l pl.UTF-8
-Moduł obsługujący myspella dla Enchanta.
-%package uspell
-Summary:       uspell provider module for Enchant
-Summary(pl.UTF-8):     Moduł obsługujący uspella dla Enchanta
-Group:         Libraries
-Requires:      %{name} = %{version}-%{release}
-Provides:      %{name}-backend
-%description uspell
-uspell provider module for Enchant.
-%description uspell -l pl.UTF-8
-Moduł obsługujący uspella dla Enchanta.
+%description hunspell -l pl.UTF-8
+Moduł obsługujący hunspella dla Enchanta.
 %package voikko
 Summary:       Voikko provider module for Enchant
@@ -188,34 +161,38 @@ Zemberek (Turkish) provider module for Enchant.
 Moduł obsługujący backend zemberek (turecki) dla Enchanta.
-%setup -q
-%patch0 -p1
+%setup -q -n enchant-%{version}
-%{__aclocal} -I ac-helpers
+%{__aclocal} -I m4
 export CFLAGS="%{rpmcflags} -fpermissive"
 export CXXFLAGS="%{rpmcxxflags} -fpermissive"
 %configure \
-       --disable-binreloc \
+       --enable-relocatable \
        %{!?with_static_libs:--disable-static} \
-       --enable-zemberek \
-       --with-ispell-dir=/usr/%{_lib}/ispell \
-       --with-myspell-dir=/usr/share/myspell \
-       --with-uspell-dir=/usr/share/uspell
+       --with-aspell \
+       --with-hspell \
+       --with-zemberek \
+       --with-hunspell \
+       --with-hunspell-dir=/usr/share/myspell
+%{__make} \
+       pkgdatadir=%{_datadir}/enchant-2
 %{__make} install \
+       pkgdatadir=%{_datadir}/enchant-2
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 # useless - modules loaded through libgmodule
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/enchant/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/enchant-2/*.{la,a}
@@ -225,52 +202,44 @@ rm -rf $RPM_BUILD_ROOT
-%attr(755,root,root) %{_bindir}/enchant
-%attr(755,root,root) %{_bindir}/enchant-lsmod
-%attr(755,root,root) %{_libdir}/*.*.*
-%attr(755,root,root) %ghost %{_libdir}/
-%dir %{_libdir}/enchant
+%attr(755,root,root) %{_bindir}/enchant-2
+%attr(755,root,root) %{_bindir}/enchant-lsmod-2
+%attr(755,root,root) %{_libdir}/*.*.*
+%attr(755,root,root) %ghost %{_libdir}/
+%dir %{_libdir}/enchant-2
 %files devel
-%attr(755,root,root) %{_libdir}/
+%attr(755,root,root) %{_libdir}/
 %if %{with static_libs}
 %files static
 %files aspell
-%attr(755,root,root) %{_libdir}/enchant/
+%attr(755,root,root) %{_libdir}/enchant-2/
 %files hspell
-%attr(755,root,root) %{_libdir}/enchant/
-%files ispell
-%attr(755,root,root) %{_libdir}/enchant/
-%files myspell
-%attr(755,root,root) %{_libdir}/enchant/
+%attr(755,root,root) %{_libdir}/enchant-2/
-%files uspell
+%files hunspell
-%attr(755,root,root) %{_libdir}/enchant/
+%attr(755,root,root) %{_libdir}/enchant-2/
 %files voikko
-%attr(755,root,root) %{_libdir}/enchant/
+%attr(755,root,root) %{_libdir}/enchant-2/
 %files zemberek
-%attr(755,root,root) %{_libdir}/enchant/
+%attr(755,root,root) %{_libdir}/enchant-2/
diff --git a/hunspell-1.4.patch b/hunspell-1.4.patch
deleted file mode 100644
index 601df54..0000000
--- a/hunspell-1.4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: fix build with hunspell 1.4
- hunspell 1.4.0 doesn't expose MAXWORDLEN anymore.
-Author: Caolan McNamara <>
-Origin: upstream bug
-diff -ru enchant-1.6.0-orig/src/myspell/myspell_checker.cpp 
---- enchant-1.6.0-orig/src/myspell/myspell_checker.cpp 2016-04-18 
12:25:00.094614256 +0100
-+++ enchant-1.6.0/src/myspell/myspell_checker.cpp      2016-04-18 
12:26:09.108569576 +0100
-@@ -148,6 +148,10 @@ MySpellChecker::~MySpellChecker()
-               g_iconv_close(m_translate_out);
- }
-+#ifndef MAXWORDLEN
-+#   define MAXWORDLEN 100
- bool
- MySpellChecker::checkWord(const char *utf8Word, size_t len)
- {

---- gitweb:

pld-cvs-commit mailing list

Reply via email to