[mingw-hunspell: 10/22] Update to 1.2.12 (RHBZ #587589)

[Kalev Lember]

commit 55ccf32a6a2fde7f148e8d5a00737c9ee345007d
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Nov 10 17:24:36 2010 +0100

    Update to 1.2.12 (RHBZ #587589)
    
    - Update to 1.2.12 (RHBZ #587589)
    - Dropped all the patches and post-install hacks
    - Rebuild in order to have soft dependency on libintl

 .gitignore            |    1 +
 mingw32-hunspell.spec |   46 ++++++++++++++--------------------------------
 sources               |    2 +-
 3 files changed, 16 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 750069c..a9599ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 hunspell-1.2.8.tar.gz
+/hunspell-1.2.12.tar.gz
diff --git a/mingw32-hunspell.spec b/mingw32-hunspell.spec
index bbc8178..6efb8fd 100644
--- a/mingw32-hunspell.spec
+++ b/mingw32-hunspell.spec
@@ -7,25 +7,15 @@
 
 Name:          mingw32-hunspell
 Summary:       MinGW Windows spell checker and morphological analyzer library
-Version:       1.2.8
-Release:       11%{?dist}
+Version:       1.2.12
+Release:       1%{?dist}
 Source0:       http://downloads.sourceforge.net/hunspell/hunspell-%{version}.tar.gz
 Group:         System Environment/Libraries
 URL:           http://hunspell.sourceforge.net/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License:       LGPLv2+ or GPLv2+ or MPLv1.1
 
-# Patches from native Fedora package
-Patch1:        hunspell-1.2.7-2314461.ispell-alike.patch
-Patch2:        hunspell-1.2.8-2784983.defaultlanguage.patch
-
-# MinGW compile fixes
-Patch10:       hunspell-disable-malloc-check.patch
-Patch11:       hunspell-mingw-compile-fix.patch
-Patch12:       hunspell-build-dll.patch
-
 BuildArch:     noarch
-BuildRequires: autoconf automake libtool
 BuildRequires: bison
 BuildRequires: gettext
 BuildRequires: mingw32-filesystem
@@ -54,16 +44,11 @@ Group:          Development/Libraries
 Static version of the MinGW Windows hunspell spell checking library.
 
 
-%{_mingw32_debug_package}
+%{?_mingw32_debug_package}
 
 
 %prep
 %setup -qn "hunspell-%{version}"
-%patch1 -p1 -b .ispell-alike.patch
-%patch2 -p1 -b .defaultlanguage.patch
-%patch10 -p0 -b .malloc.patch
-%patch11 -p0 -b .mingw.patch
-%patch12 -p0 -b .dll.patch
 
 # Some files aren't UTF-8
 for i in AUTHORS.myspell; do
@@ -73,10 +58,6 @@ done
 
 
 %build
-aclocal -I m4 --force
-autoconf --force
-automake --force --add-missing
-libtoolize --automake --force
 %{_mingw32_configure} --enable-static --enable-shared --with-ui --with-readline
 make %{?_smp_mflags}
 
@@ -85,17 +66,9 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/example
-mv $RPM_BUILD_ROOT%{_mingw32_includedir}/*munch* $RPM_BUILD_ROOT%{_mingw32_includedir}/hunspell
-
 # Drop the man pages
 rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/man
 
-# For some strange reason the static library gets an empty extension (libhunspell-1.2.)
-# Fix this manually
-mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libhunspell-1.2. $RPM_BUILD_ROOT%{_mingw32_libdir}/libhunspell-1.2.a
-sed -i s/"libhunspell-1.2.'"/"libhunspell-1.2.a'"/  $RPM_BUILD_ROOT%{_mingw32_libdir}/libhunspell-1.2.la
-
 %find_lang hunspell
 
 
@@ -106,15 +79,19 @@ rm -rf $RPM_BUILD_ROOT
 %files -f hunspell.lang
 %defattr(-,root,root,-)
 %doc README README.myspell COPYING COPYING.LGPL COPYING.MPL AUTHORS AUTHORS.myspell license.hunspell license.myspell THANKS
+%{_mingw32_bindir}/i686-pc-mingw32-affixcompress
 %{_mingw32_bindir}/i686-pc-mingw32-analyze.exe
 %{_mingw32_bindir}/i686-pc-mingw32-chmorph.exe
-%{_mingw32_bindir}/i686-pc-mingw32-example.exe
 %{_mingw32_bindir}/i686-pc-mingw32-hunspell.exe
 %{_mingw32_bindir}/i686-pc-mingw32-hunzip.exe
 %{_mingw32_bindir}/i686-pc-mingw32-hzip.exe
+%{_mingw32_bindir}/i686-pc-mingw32-ispellaff2myspell
+%{_mingw32_bindir}/i686-pc-mingw32-makealias
 %{_mingw32_bindir}/i686-pc-mingw32-munch.exe
 %{_mingw32_bindir}/i686-pc-mingw32-unmunch.exe
-%{_mingw32_bindir}/libhunspell-1.2-1.dll
+%{_mingw32_bindir}/i686-pc-mingw32-wordforms
+%{_mingw32_bindir}/i686-pc-mingw32-wordlist2hunspell
+%{_mingw32_bindir}/libhunspell-1.2-0.dll
 %{_mingw32_includedir}/hunspell/
 %{_mingw32_libdir}/libhunspell-1.2.dll.a
 %{_mingw32_libdir}/libhunspell-1.2.la
@@ -127,6 +104,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov 10 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.2.12-1
+- Update to 1.2.12 (RHBZ #587589)
+- Dropped all the patches and post-install hacks
+- Rebuild in order to have soft dependency on libintl
+
 * Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.2.8-11
 - Rebuild because of broken mingw32-gcc/mingw32-binutils
 
diff --git a/sources b/sources
index 2406976..fb24f91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1177af54a09e320d2c24015f29c3a93e  hunspell-1.2.8.tar.gz
+5ef2dc1026660d0ffb7eae7b511aee23  hunspell-1.2.12.tar.gz