From 419ebc96d704752ad0e75d73e9ade886cf55d491 Mon Sep 17 00:00:00 2001
From: Ville-Pekka Vainio <vpv@fedoraproject.org>
Date: Fri, 18 Sep 2009 09:41:53 +0000
Subject: [PATCH] - 2.2rc2 - Remove getcwd() value check patch, accepted
 upstream

---
 .cvsignore                       |  2 +-
 libvoikko-2.2-check_getcwd.patch | 15 ---------------
 libvoikko.spec                   | 11 ++++++-----
 sources                          |  2 +-
 4 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 libvoikko-2.2-check_getcwd.patch

diff --git a/.cvsignore b/.cvsignore
index 52098e7..b1ba0df 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libvoikko-2.2rc1.tar.gz
+libvoikko-2.2rc2.tar.gz
diff --git a/libvoikko-2.2-check_getcwd.patch b/libvoikko-2.2-check_getcwd.patch
deleted file mode 100644
index 1d4d59f..0000000
--- a/libvoikko-2.2-check_getcwd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 e6a684b..3cbe2d4 100644
--- a/libvoikko.spec
+++ b/libvoikko.spec
@@ -1,6 +1,6 @@
 Name:           libvoikko
 Version:        2.2
-Release:        0.2.rc1%{?dist}
+Release:        0.3.rc2%{?dist}
 Summary:        Voikko is a library for spellcheckers and hyphenators
 
 Group:          System Environment/Libraries
@@ -9,9 +9,7 @@ URL:            http://voikko.sourceforge.net/
 # The usual format of stable release URLs
 #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
-# Sent upstream
-Patch0:         libvoikko-2.2-check_getcwd.patch
+Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python glib2-devel
@@ -51,7 +49,6 @@ scripts.
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -103,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libvoikko.pc
 
 %changelog
+* Fri Sep 18 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-0.3.rc2
+- 2.2rc2
+- Remove getcwd() value check patch, accepted upstream
+
 * Wed Sep 16 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-0.2.rc1
 - Remove rpath which was set for the voikko-tools binaries in 64 bit
   architechtures
diff --git a/sources b/sources
index 45d1cbe..c26cb1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2513a38189fbda0818b107ad72c0ab59  libvoikko-2.2rc1.tar.gz
+d60aa199cd6a112bca782728851f82b4  libvoikko-2.2rc2.tar.gz