[calligra/f18] 2.5.4

[Rex Dieter]

commit 534f87d4eda052ab96f6c10d5adc7fd1abc79cd8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Nov 19 14:27:09 2012 -0600

    2.5.4

 .gitignore                     |    2 +-
 calligra-2.5.3-qreal_arm.patch |   14 --------------
 calligra.spec                  |   10 +++++-----
 sources                        |    2 +-
 4 files changed, 7 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cda1f5e..0821316 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/calligra-2.5.3.tar.bz2
+/calligra-2.5.4.tar.bz2
diff --git a/calligra.spec b/calligra.spec
index a3cfd2b..e09b97e 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -13,8 +13,8 @@
 #endif
 
 Name:    calligra 
-Version: 2.5.3
-Release: 2%{?dist}
+Version: 2.5.4
+Release: 1%{?dist}
 Summary: An integrated office suite
 
 License: GPLv2+ and LGPLv2+
@@ -28,8 +28,6 @@ URL:     http://www.calligra-suite.org/
 Source0: http://download.kde.org/%{stable}/calligra-%{version}/calligra-%{version}.tar.bz2
 
 ## upstreamable patches
-# fix qreal != double assumptions, fixes FTBFS on arm
-Patch50: calligra-2.5.3-qreal_arm.patch
 
 ## upstream patches
 Patch100: calligra-2.4.91-tables_to_sheets.patch
@@ -444,7 +442,6 @@ sed -i -e 's|../src|../kdchart|' include/*
 popd
 ## kdchart munging end
 
-%patch50 -p1 -b .qreal_arm
 # rename sheets to tables 
 %patch100 -p1 -b .tables_to_sheets
 
@@ -1103,6 +1100,9 @@ fi
 
 
 %changelog
+* Mon Nov 19 2012 Rex Dieter <rdieter at fedoraproject.org> 2.5.4-1
+- 2.5.4
+
 * Fri Nov 02 2012 Rex Dieter <rdieter at fedoraproject.org> 2.5.3-2
 - fix FTBFS on arm
 
diff --git a/sources b/sources
index 484fd63..20f11c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83e2679b7ecb923b953ace06db7ca4c2  calligra-2.5.3.tar.bz2
+54f4677a9b00eec5951fa2386ba271a1  calligra-2.5.4.tar.bz2