[koffice] - koffice-2.3.1

[Rex Dieter]

commit 2228fc8eb54cb993c476b8f053023d170ce69199
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jan 17 20:22:44 2011 -0600

    - koffice-2.3.1

 .gitignore                            |    3 +-
 koffice-2.3.0-libwpd09-libwpg02.patch | 1541 ---------------------------------
 koffice.spec                          |   16 +-
 sources                               |    2 +-
 4 files changed, 7 insertions(+), 1555 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fce5ffb..1eb1fe4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/koffice-2.2.84.tar.bz2
-/koffice-2.3.0.tar.bz2
+/koffice-2.3.1.tar.bz2
diff --git a/koffice.spec b/koffice.spec
index 5ca158e..35bcfa9 100644
--- a/koffice.spec
+++ b/koffice.spec
@@ -20,8 +20,8 @@
 
 Name:           koffice
 Epoch:          3 
-Version:        2.3.0
-Release:        3%{?dist}
+Version:        2.3.1
+Release:        1%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -34,14 +34,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ## upstreamable patches
 ## upstream patches
 
-# backport support for libwpd 0.9 and libwpg 0.2 from Calligra master:
-# http://gitweb.kde.org/calligra.git/commit/80df4d7ec727d6cc462aaca97688704b2bcd713e
-# http://gitweb.kde.org/calligra.git/commit/2e50c22959fffa3fd18f0162b0688623206cf965
-# http://gitweb.kde.org/calligra.git/commit/2772444699655792e22a004c60acbdea139b51cf
-# http://gitweb.kde.org/calligra.git/commit/9cda7aed2ea103750172e61f5c800a474913fa59
-# http://git.reviewboard.kde.org/r/100287/ (warning fix, pending approval)
-Patch100:       koffice-2.3.0-libwpd09-libwpg02.patch
-
 #-- The following OPTIONAL packages could NOT be located on your system.
 #-- Consider installing them to enable more features from this software.
 #-----------------------------------------------------------------------------
@@ -498,7 +490,6 @@ Requires:       libxml2-devel
 
 %prep
 %setup -q
-%patch100 -p1 -b .libwpd09-libwpg02
 
 ## kdchart munging begin
 pushd plugins/chartshape/kdchart
@@ -1204,6 +1195,9 @@ fi
 
 
 %changelog
+* Mon Jan 17 2011 Rex Dieter <rdieter at fedoraproject.org> - 3:2.3.1-1
+- koffice-2.3.1
+
 * Thu Jan 13 2011 Rex Dieter <rdieter at fedoraproject.org> - 3:2.3.0-3
 - rebuild (openjpeg)
 
diff --git a/sources b/sources
index 5669eca..d4a89e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f99a44b004e4a237890e0834a09964b  koffice-2.3.0.tar.bz2
+5ae8fa9d557f192bd6365f9450785228  koffice-2.3.1.tar.bz2