[openoffice.org-voikko] * Thu Aug 05 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.1.2-1 - New upstream release -

[Ville-Pekka Vainio]

commit 181d926538f3cff60a6e8ad0ec87747b8ac09698
Author: Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
Date:   Thu Aug 5 21:27:02 2010 +0300

    * Thu Aug 05 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.1.2-1
    - New upstream release
    - Remove both patches, upstreamed

 .gitignore                 |    1 +
 openoffice.org-voikko.spec |   14 ++++++--------
 sources                    |    2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 92fc2c2..a5fd91a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 openoffice.org-voikko-3.1.tar.gz
+openoffice.org-voikko-3.1.2.tar.gz
diff --git a/openoffice.org-voikko.spec b/openoffice.org-voikko.spec
index 90d1e8b..7d2a171 100644
--- a/openoffice.org-voikko.spec
+++ b/openoffice.org-voikko.spec
@@ -1,6 +1,6 @@
 Name:           openoffice.org-voikko
-Version:        3.1 
-Release:        5%{?dist}
+Version:        3.1.2
+Release:        1%{?dist}
 Summary:        Finnish spellchecker and hyphenator extension for OpenOffice.org
 
 Group:          Applications/Productivity
@@ -10,10 +10,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}rc2.tar.gz
-# SVN r3103, partially fix rhbz #549289
-Patch0:         ooovoikko-svn-r3103-damaged-configuration-handling-fix.patch
-# rhbz #618151
-Patch1:         openoffice.org-voikko-3.1-malformed-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    openoffice.org-sdk >= 1:3.3.0
@@ -40,8 +36,6 @@ provided by the Voikko library.
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
 
 
 # Make install-unpacked also builds before installing, leave the build section
@@ -76,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 05 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.1.2-1
+- New upstream release
+- Remove both patches, upstreamed
+
 * Tue Jul 27 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.1-5
 - Fix for rhbz #618151, switch group elements to node elements in config.xcu,
   patch by David Tardon
diff --git a/sources b/sources
index 56a41b6..9c8ff48 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8dda075fa199fe9cd0f6b5ec1f2ff46e  openoffice.org-voikko-3.1.tar.gz
+de254b8ea791b7b86d3b2a05786879f2  openoffice.org-voikko-3.1.2.tar.gz