From 1e18ecb71f3b63c539f755d70199261e66a7dd82 Mon Sep 17 00:00:00 2001
From: Ville-Pekka Vainio <vpv@fedoraproject.org>
Date: Sep 15 2009 20:37:37 +0000
Subject: - New release candidate

- Improvements to spelling suggestions, grammar checker etc.
- Libvoikko now uses its own internal implementation of malaga.
- This prevents symbol conflicts such as https://bugzilla.redhat.com/502546
- BuildRequires malaga removed and glib2-devel added.
- Require malaga-suomi-voikko >= 1.4, libvoikko 2.2 expects the newer
    dictionary format
- Add a patch to make it compile on Fedora with -Werror

---

diff --git a/.cvsignore b/.cvsignore
index eb106f0..52098e7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libvoikko-2.1.tar.gz
+libvoikko-2.2rc1.tar.gz
diff --git a/libvoikko-2.2-check_getcwd.patch b/libvoikko-2.2-check_getcwd.patch
new file mode 100644
index 0000000..1d4d59f
--- /dev/null
+++ b/libvoikko-2.2-check_getcwd.patch
@@ -0,0 +1,15 @@
+diff -Naur libvoikko-2.2.orig/src/morphology/malaga/files.cpp libvoikko-2.2/src/morphology/malaga/files.cpp
+--- libvoikko-2.2.orig/src/morphology/malaga/files.cpp	2009-09-15 18:13:31.226662282 +0300
++++ libvoikko-2.2/src/morphology/malaga/files.cpp	2009-09-15 18:18:53.658662494 +0300
+@@ -337,10 +337,9 @@
+       add_to_text( path, relative_dir );
+       free_mem( &relative_dir );
+     } 
+-    else 
++    else if (getcwd( current_dir, MAX_PATH_SIZE ) != NULL)
+     { 
+       /* Put current directory in front. */
+-      getcwd( current_dir, MAX_PATH_SIZE );
+       add_to_text( path, current_dir );
+     }
+   }
diff --git a/libvoikko.spec b/libvoikko.spec
index 9380eda..2a177bb 100644
--- a/libvoikko.spec
+++ b/libvoikko.spec
@@ -1,20 +1,22 @@
 Name:           libvoikko
-Version:        2.1
-Release:        2%{?dist}
+Version:        2.2
+Release:        0.1.rc1%{?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}rc4.tar.gz
+Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc1.tar.gz
+# Sent upstream
+Patch0:         libvoikko-2.2-check_getcwd.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  malaga-devel >= 7.8 python
-# Needed for the new dictionary directory layout
-Requires:       malaga-suomi-voikko >= 1.3-10
+BuildRequires:  python glib2-devel
+# Libvoikko >= 2.2 needs this, earlier versions won't work
+Requires:       malaga-suomi-voikko >= 1.4
 
 %description
 This is libvoikko, library for spellcheckers and hyphenators using Malaga
@@ -49,6 +51,7 @@ scripts.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -96,6 +99,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libvoikko.pc
 
 %changelog
+* Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-0.1.rc1
+- New release candidate
+- Improvements to spelling suggestions, grammar checker etc.
+- Libvoikko now uses its own internal implementation of malaga.
+- This prevents symbol conflicts such as https://bugzilla.redhat.com/502546
+- BuildRequires malaga removed and glib2-devel added.
+- Require malaga-suomi-voikko >= 1.4, libvoikko 2.2 expects the newer
+  dictionary format
+- Add a patch to make it compile on Fedora with -Werror
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index b058254..45d1cbe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0c04a2979126fc9103fa4d88358c90a  libvoikko-2.1.tar.gz
+2513a38189fbda0818b107ad72c0ab59  libvoikko-2.2rc1.tar.gz