commit 3ead173f8afd3ccc824c506b39f280cb63fec1e5
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Wed Jul 31 18:16:08 2013 -0500
2.7.1
.gitignore | 3 +--
calligra-2.7.0-krita_mime_install.patch | 11 -----------
calligra.spec | 16 ++++++----------
qreal_double.patch | 21 ---------------------
sources | 2 +-
5 files changed, 8 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a20751d..83417c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/calligra-2.6.4.tar.bz2
-/calligra-2.7.0.tar.bz2
+/calligra-2.7.1.tar.xz
diff --git a/calligra.spec b/calligra.spec
index 9f118bb..64c18aa 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -14,8 +14,8 @@
%global _changelog_trimtime %(date +%s -d "1 year ago")
Name: calligra
-Version: 2.7.0
-Release: 3%{?dist}
+Version: 2.7.1
+Release: 1%{?dist}
Summary: An integrated office suite
License: GPLv2+ and LGPLv2+
@@ -26,15 +26,11 @@ URL:
http://www.calligra-suite.org/
%else
%global stable stable
%endif
-Source0:
http://download.kde.org/%{stable}/calligra-%{version}/calligra-%{version}...
+Source0:
http://download.kde.org/%{stable}/calligra-%{version}/calligra-%{version}...
## upstreamable patches
-# arm qreal vs float patch courtesy of kubuntu
-#
http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/calligra...
-Patch50: qreal_double.patch
## upstream patches
-Patch100: calligra-2.7.0-krita_mime_install.patch
BuildRequires: boost-devel
BuildRequires: bzip2-devel bzip2
@@ -468,9 +464,6 @@ Requires: okular%{?_kde4_version: >= %{_kde4_version}}
%prep
%setup -q
-%patch50 -p1 -b .qreal_double
-%patch100 -p1 -b .krita_mime_install
-
## kdchart munging begin
pushd 3rdparty/kdchart
mv src kdchart
@@ -1163,6 +1156,9 @@ fi
%changelog
+* Wed Jul 31 2013 Rex Dieter <rdieter(a)fedoraproject.org> 2.7.1-1
+- 2.7.1
+
* Tue Jul 30 2013 Petr Machata <pmachata(a)redhat.com> - 2.7.0-3
- Rebuild for boost 1.54.0
diff --git a/sources b/sources
index e9981a5..bfc1b46 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae154d84e3745bfd170020066f6086e8 calligra-2.7.0.tar.bz2
+9cf909ddf57ecb16d4370cc1062d0f7f calligra-2.7.1.tar.xz