[calligra/f17] manifest file corrupted (#814643, kde#298134)

[Rex Dieter]

commit b1491227b297aee221bb48c20cfe551d33283388
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Apr 20 08:46:20 2012 -0500

    manifest file corrupted (#814643, kde#298134)

 298134_updated.patch |   19 +++++++++++++++++++
 calligra.spec        |   10 +++++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/298134_updated.patch b/298134_updated.patch
new file mode 100644
index 0000000..398933d
--- /dev/null
+++ b/298134_updated.patch
@@ -0,0 +1,19 @@
+diff --git a/libs/odf/KoXmlWriter.h b/libs/odf/KoXmlWriter.h
+index 684871c..d5d8ca1 100644
+--- a/libs/odf/KoXmlWriter.h
++++ b/libs/odf/KoXmlWriter.h
+@@ -252,6 +252,14 @@ private:
+         Tag(const char* t = 0, bool ind = true)
+                 : tagName(t), hasChildren(false), lastChildIsText(false),
+                 openingTagClosed(false), indentInside(ind) {}
++        Tag(const Tag &original)
++        {
++            tagName = original.tagName;
++            hasChildren = original.hasChildren;
++            lastChildIsText = original.lastChildIsText;
++            openingTagClosed = original.openingTagClosed;
++            indentInside = original.indentInside;
++        }
+         const char* tagName;
+         bool hasChildren : 1; ///< element or text children
+         bool lastChildIsText : 1; ///< last child is a text node
diff --git a/calligra.spec b/calligra.spec
index 00fa42a..a90977c 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -8,7 +8,7 @@
 
 Name:    calligra 
 Version: 2.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: An integrated office suite
 
 License: GPLv2+ and LGPLv2+
@@ -22,6 +22,10 @@ Patch50: calligra-2.3.87-gcc47.patch
 Patch51: calligra-2.3.92-tables_to_sheets.patch
 
 ## upstream patches
+# https://git.reviewboard.kde.org/r/104677/
+# https://bugs.kde.org/298134
+# https://bugzilla.redhat.com/814643
+Patch100:  298134_updated.patch
 
 BuildRequires: boost-devel
 BuildRequires: bzip2-devel bzip2
@@ -421,6 +425,7 @@ Requires: okular%{?_kde4_version: >= %{_kde4_version}}
 
 %patch50 -p1 -b .gcc47
 %patch51 -p1 -b .tables_to_sheets
+%patch100 -p1 -b .kdebug298134
 
 ## kdchart munging begin
 pushd plugins/chartshape/kdchart
@@ -1113,6 +1118,9 @@ fi
 
 
 %changelog
+* Fri Apr 20 2012 Rex Dieter <rdieter at fedoraproject.org> 2.4.0-4
+- manifest file corrupted (#814643, kde#298134)
+
 * Mon Apr 16 2012 Rex Dieter <rdieter at fedoraproject.org> 2.4.0-3
 - -sheets: Provides: -tables