From 707f3a6e3b2163af422735a2edd3ef713eaaa918 Mon Sep 17 00:00:00 2001
From: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>
Date: Fri, 25 Mar 2011 12:57:17 +0200
Subject: [PATCH] New upstream release

---
 libvoikko-3.1-gcc-4.6-fix.patch | 20 --------------------
 libvoikko.spec                  |  9 +++++----
 2 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 libvoikko-3.1-gcc-4.6-fix.patch

diff --git a/libvoikko-3.1-gcc-4.6-fix.patch b/libvoikko-3.1-gcc-4.6-fix.patch
deleted file mode 100644
index aedba61..0000000
--- a/libvoikko-3.1-gcc-4.6-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur libvoikko-3.1.orig/src/morphology/malaga/values.cpp libvoikko-3.1/src/morphology/malaga/values.cpp
---- libvoikko-3.1.orig/src/morphology/malaga/values.cpp	2010-11-14 11:10:16.000000000 +0200
-+++ libvoikko-3.1/src/morphology/malaga/values.cpp	2011-02-15 16:44:03.695451550 +0200
-@@ -1216,7 +1216,7 @@
-  * symbols. If a value is a list, the elements of this list are inserted into
-  * NEW_LIST instead of the value itself. */
- {
--  value_t new_list, v, element_end;
-+  value_t new_list, v;
-   int_t i, new_list_length;
-   value_t *elements;
- 
-@@ -1227,7 +1227,6 @@
-     switch (TYPE( elements[i] )) 
-     {
-     case LIST_TYPE:
--      element_end = NEXT_VALUE( elements[i] );
-       new_list_length += length_of_value( elements[i] ) - 2;
-       break;
-     case SYMBOL_TYPE:
diff --git a/libvoikko.spec b/libvoikko.spec
index c5c1e86..bc49bd8 100644
--- a/libvoikko.spec
+++ b/libvoikko.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           libvoikko
-Version:        3.1
-Release:        3%{?dist}
+Version:        3.2
+Release:        1%{?dist}
 Summary:        Voikko is a library for spellcheckers and hyphenators
 
 Group:          System Environment/Libraries
@@ -11,7 +11,6 @@ URL:            http://voikko.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
 # The usual format of test release URLs
 #Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc1.tar.gz
-Patch0:         libvoikko-3.1-gcc-4.6-fix.patch
 
 BuildRequires:  python-devel
 # Libvoikko >= 2.2 needs this, earlier versions won't work
@@ -63,7 +62,6 @@ tasks on Finnish text.
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -118,6 +116,9 @@ install -pm 0644 python/libvoikko.py $RPM_BUILD_ROOT%{python_sitelib}/
 %{python_sitelib}/%{name}.py*
 
 %changelog
+* Fri Mar 25 2011 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.2-1
+- New upstream release
+
 * Tue Feb 15 2011 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.1-3
 - Add patch to fix build with GCC 4.6