[calligra] calligra-2.4.2

[Rex Dieter]

commit 47394d45fc1cdae6372816eeef97899135fa511a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat May 26 12:31:41 2012 -0500

    calligra-2.4.2

 .gitignore                             |    2 +-
 calligra-2.3.92-tables_to_sheets.patch |   31 -------------
 calligra-2.4.1-kocolorset-2.patch      |   65 --------------------------
 calligra-2.4.1-kocolorset.patch        |   78 --------------------------------
 calligra.spec                          |   19 ++------
 sources                                |    2 +-
 6 files changed, 7 insertions(+), 190 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f074812..b33be08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/calligra-2.4.1.tar.bz2
+/calligra-2.4.2.tar.bz2
diff --git a/calligra.spec b/calligra.spec
index cfc7ad5..cc00b18 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -7,8 +7,8 @@
 %endif
 
 Name:    calligra 
-Version: 2.4.1
-Release: 4%{?dist}
+Version: 2.4.2
+Release: 1%{?dist}
 Summary: An integrated office suite
 
 License: GPLv2+ and LGPLv2+
@@ -18,14 +18,6 @@ Source0: http://download.kde.org/stable/calligra-%{version}/calligra-%{version}.
 ## upstreamable patches
 
 ## upstream patches
-# scripts missed tables->sheets rename
-# upstreamed http://quickgit.kde.org/?p=calligra.git&a=commit&h=c19ebfe046ebfad35f1fec54a3e75e9986db2643
-Patch101: calligra-2.3.92-tables_to_sheets.patch
-# Calligra Products segfault when opening a new doc / new from template, http://bugzilla.redhat.com/819371
-# Crash when opening a new document with custom settings, http://bugs.kde.org/298412
-Patch102: calligra-2.4.1-kocolorset.patch
-# followup http://quickgit.kde.org/index.php?p=calligra.git&a=commit&h=512c6fa18825798e01ead1f0f009608b5281e5e0
-Patch103: calligra-2.4.1-kocolorset-2.patch
 
 BuildRequires: boost-devel
 BuildRequires: bzip2-devel bzip2
@@ -423,10 +415,6 @@ Requires: okular%{?_kde4_version: >= %{_kde4_version}}
 %prep
 %setup -q
 
-%patch101 -p1 -b .tables_to_sheets
-%patch102 -p1 -b .kocolorset
-%patch103 -p1 -b .kocolorset-2
-
 ## kdchart munging begin
 pushd plugins/chartshape/kdchart
 mv src kdchart
@@ -1118,6 +1106,9 @@ fi
 
 
 %changelog
+* Sat May 26 2012 Rex Dieter <rdieter at fedoraproject.org> 2.4.2-1
+- calligra-2.4.2
+
 * Wed May 16 2012 Marek Kasik <mkasik at redhat.com> - 2.4.1-4
 - Rebuild (poppler-0.20.0)
 
diff --git a/sources b/sources
index 4a00086..5d2acbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4da7e1181e1539850a4fcae466d7d75  calligra-2.4.1.tar.bz2
+31b0c44ad4ee27017580c7c2fc8e87a9  calligra-2.4.2.tar.bz2