[calligra] 2.6.0

[Rex Dieter]

commit fd99de79f9d4f76b852b72d81ad39d7cea9c80ae
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 4 12:09:38 2013 -0600

    2.6.0

 .gitignore    |    4 ++--
 calligra.spec |   23 +++++++++++++++++++----
 sources       |    2 +-
 3 files changed, 22 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a90db36..e0f3f52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/calligra-2.5.4.tar.bz2
-/calligra-2.5.93.tar.bz2
+/calligra-2.5.5.tar.bz2
+/calligra-2.6.0.tar.bz2
diff --git a/calligra.spec b/calligra.spec
index 2ee0e7e..62fad3b 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -11,8 +11,8 @@
 %define marble 1
 
 Name:    calligra 
-Version: 2.5.93
-Release: 4%{?dist}
+Version: 2.6.0
+Release: 1%{?dist}
 Summary: An integrated office suite
 
 License: GPLv2+ and LGPLv2+
@@ -51,8 +51,8 @@ BuildRequires: kdepimlibs-devel
 BuildRequires: pkgconfig(QtGui) 
 BuildRequires: pkgconfig(lcms2)
 BuildRequires: pkgconfig(gl) pkgconfig(glu) 
-# FIXME/TODO: kde-4.9.x only has 6.0
-#BuildRequires: pkgconfig(kactivities) >= 6.1
+# kactivities-6.1+, part of kde-4.10+
+BuildRequires: pkgconfig(libkactivities)
 BuildRequires: libjpeg-devel
 %if 0%{?marble}
 BuildRequires: marble-devel
@@ -60,6 +60,7 @@ BuildRequires: marble-devel
 BuildRequires: okular-devel
 BuildRequires: pkgconfig(icu-i18n)
 BuildRequires: pkgconfig(libkdcraw)
+BuildRequires: pkgconfig(OpenColorIO)
 BuildRequires: pkgconfig(poppler-qt4)
 BuildRequires: pkgconfig(libpng)
 BuildRequires: libspnav-devel
@@ -89,6 +90,17 @@ BuildRequires: pkgconfig(sqlite3)
 # not detected, doesn't work, some xbase vs xbase64 differences ? -- rex
 #BuildRequires: xbase-devel
 
+#-----------------------------------------------------------------------------
+#-- The following OPTIONAL packages could NOT be located on your system.
+#-- Consider installing them to enable more features from this software.
+#-----------------------------------------------------------------------------
+#   * XBase  <http://linux.techass.com/projects/xdb>
+#     XBase compatible C++ class library
+#     Required by Kexi XBase driver
+#   * Vc  <http://code.compeng.uni-frankfurt.de/projects/vc>
+#     Portable, zero-overhead SIMD library for C++
+#     Required by the Krita for vectorization
+
 Obsoletes: koffice < %{koffice_ver} 
 Obsoletes: koffice-suite < %{koffice_ver}
 
@@ -1135,6 +1147,9 @@ fi
 
 
 %changelog
+* Mon Feb 04 2013 Rex Dieter <rdieter at fedoraproject.org> 2.6.0-1
+- 2.6.0
+
 * Sat Jan 26 2013 Rex Dieter <rdieter at fedoraproject.org> 2.5.93-4
 - rebuild (icu)
 
diff --git a/sources b/sources
index 27a793e..99707ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-48d6474b9c2a96f472451b21de274492  calligra-2.5.93.tar.bz2
+df7c2816d2bbe5e2fe87ea0be3fe668c  calligra-2.6.0.tar.bz2