From 9f5aa4ec4e306b3fb359ad315262215d46f59f48 Mon Sep 17 00:00:00 2001
From: Ville-Pekka Vainio <vpv@fedoraproject.org>
Date: Tue, 7 Apr 2009 19:30:47 +0000
Subject: [PATCH] - New release candidate - Both patches applied upstream

---
 .cvsignore     |  2 +-
 libvoikko.spec | 26 ++++++++++++++++++++------
 sources        |  2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 29beac2..8395008 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libvoikko-2.0.tar.gz
+libvoikko-2.1rc2.tar.gz
diff --git a/libvoikko.spec b/libvoikko.spec
index 1fd6069..dc69998 100644
--- a/libvoikko.spec
+++ b/libvoikko.spec
@@ -1,19 +1,20 @@
 Name:           libvoikko
-Version:        2.0
-Release:        2%{?dist}
+Version:        2.1
+Release:        0.2.rc2%{?dist}
 Summary:        Voikko is a library for spellcheckers and hyphenators
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://voikko.sourceforge.net/
 # The usual format of stable release URLs
-Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
+#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
+Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  malaga-devel >= 7.8
-Requires:       malaga-suomi-voikko >= 0.7.3
+BuildRequires:  malaga-devel >= 7.8 python
+# Needed for the new dictionary directory layout
+Requires:       malaga-suomi-voikko >= 1.3-10
 
 %description
 This is libvoikko, library for spellcheckers and hyphenators using Malaga
@@ -95,6 +96,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libvoikko.pc
 
 %changelog
+* Mon Apr 6 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.2.rc2
+- New release candidate
+- Both patches applied upstream
+
+* Mon Apr 6 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.1.rc1
+- New release candidate
+- Improvements on grammar checking and dictionary loading
+- Raise malaga-suomi-voikko dependency to 1.3-10, which has the new dictionary
+  data directory layout needed by this version of libvoikko
+- Add BuildRequires python for running the trie compiler during build
+- Add patch for GCC 4.4 and glibc 2.90 compliance
+- Add patch to fix warn_unused_result errors
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 98847ec..8f385f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-156dad1837c547d5cad078c4d7d9a1a1  libvoikko-2.0.tar.gz
+4fc9aaf66891a1f5ec1ada65d558fb21  libvoikko-2.1rc2.tar.gz