[calligra] 2.5.91

[Rex Dieter]

commit 274f635a4850cb8ed2ff3964a781a40c6d4283c3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Nov 5 09:37:30 2012 -0600

    2.5.91

 .gitignore                             |    1 +
 calligra-2.4.91-tables_to_sheets.patch |   50 --------------------------------
 calligra.spec                          |   36 ++++++----------------
 sources                                |    2 +-
 4 files changed, 12 insertions(+), 77 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cda1f5e..be85121 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /calligra-2.5.3.tar.bz2
+/calligra-2.5.91.tar.bz2
diff --git a/calligra.spec b/calligra.spec
index c280a95..c850b60 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -13,7 +13,7 @@
 #endif
 
 Name:    calligra 
-Version: 2.5.3
+Version: 2.5.91
 Release: 1%{?dist}
 Summary: An integrated office suite
 
@@ -30,7 +30,6 @@ Source0: http://download.kde.org/%{stable}/calligra-%{version}/calligra-%{versio
 ## upstreamable patches
 
 ## upstream patches
-Patch100: calligra-2.4.91-tables_to_sheets.patch
 
 BuildRequires: boost-devel
 BuildRequires: bzip2-devel bzip2
@@ -54,6 +53,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
 BuildRequires: libjpeg-devel
 %if 0%{?marble}
 BuildRequires: marble-devel
@@ -442,17 +443,12 @@ sed -i -e 's|../src|../kdchart|' include/*
 popd
 ## kdchart munging end
 
-# rename sheets to tables 
-%patch100 -p1 -b .tables_to_sheets
-
 
 %build
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-# SET EIGEN2_INCLUDE_DIR since our kde4_incdir != eigen2_incdir
 %{cmake_kde4} \
-  -DEIGEN2_INCLUDE_DIR:PATH=%{_includedir}/eigen2 \
   -DBUILD_active:BOOL=OFF \
   -DBUILD_cstester:BOOL=OFF \
   -DBUILD_koabstraction:BOOL=OFF \
@@ -514,7 +510,6 @@ rm -fv %{buildroot}%{_kde4_libdir}/kde4/*kchart*.*
 rm -rfv %{buildroot}%{_kde4_appsdir}/kchart/
 rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kchart/
 rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/kchart*.desktop
-rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kchart_konqi.desktop
 %endif
 %if ! 0%{?kformula}
 rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/kformulapart.desktop
@@ -570,7 +565,6 @@ fi
 %{_kde4_libdir}/kde4/thesaurustool.so
 %{_kde4_libdir}/kde4/artistictextshape.so
 %{_kde4_libdir}/kde4/chartshape.so
-%{_kde4_libdir}/kde4/commentshape.so
 %{_kde4_libdir}/kde4/musicshape.so
 %{_kde4_libdir}/kde4/pictureshape.so
 %{_kde4_libdir}/kde4/pluginshape.so
@@ -590,7 +584,6 @@ fi
 %{_kde4_datadir}/kde4/services/calligradockers.desktop
 %{_kde4_datadir}/kde4/services/calligrastageeventactions.desktop
 %{_kde4_datadir}/kde4/services/calligrastagetoolanimation.desktop
-%{_kde4_datadir}/kde4/services/calligrathumbnail.desktop
 %{_kde4_datadir}/kde4/services/changecase.desktop
 %{_kde4_datadir}/kde4/services/defaulttools.desktop
 %{_kde4_datadir}/kde4/services/kodocinfopropspage.desktop
@@ -617,7 +610,6 @@ fi
 %{_kde4_datadir}/kde4/servicetypes/widgetfactory.desktop
 %{_kde4_datadir}/kde4/services/artistictextshape.desktop
 %{_kde4_datadir}/kde4/services/chartshape.desktop
-%{_kde4_datadir}/kde4/services/commentshape.desktop
 %{_kde4_datadir}/kde4/services/formulashape.desktop
 %{_kde4_datadir}/kde4/services/kexirelationdesignshape.desktop
 %{_kde4_datadir}/kde4/services/musicshape.desktop
@@ -634,9 +626,6 @@ fi
 %dir %{_datadir}/color/
 %dir %{_datadir}/color/icc/
 %{_datadir}/color/icc/pigment/
-%if 0%{?GTL}
-%{_kde4_appsdir}/pigmentcms/
-%endif
 %{_kde4_datadir}/kde4/servicetypes/pigment*.desktop
 %{_kde4_libdir}/kde4/pathshapes.so
 %{_kde4_datadir}/kde4/services/pathshapes.desktop
@@ -688,8 +677,11 @@ fi
 %{_kde4_includedir}/sheets/
 %{_kde4_includedir}/words/
 
+%post kdchart -p /sbin/ldconfig
+%postun kdchart -p /sbin/ldconfig
+
 %files kdchart
-%{_kde4_libdir}/libkdchart.so.10*
+%{_kde4_libdir}/libkdchart.so.11*
 
 %files kdchart-devel
 %{_kde4_libdir}/libkdchart.so
@@ -778,14 +770,11 @@ fi
 %{_kde4_libdir}/kde4/opencalcimport.*
 %{_kde4_libdir}/kde4/qproimport.*
 %{_kde4_libdir}/kde4/xlsximport.*
-%{_kde4_libdir}/kde4/krossmodulekspread.so
 %{_kde4_libdir}/kde4/kspread_plugin_tool_calendar.so
-%{_kde4_libdir}/kde4/kspreadsolver.so
 %{_kde4_libdir}/kde4/spreadsheetshape-deferred.so
 %{_kde4_appsdir}/sheets/
 %{_kde4_configdir}/sheetsrc
 %{_kde4_datadir}/config.kcfg/sheets.kcfg
-%{_kde4_datadir}/kde4/services/krossmodulekspread.desktop
 %{_kde4_datadir}/kde4/services/kspread_plugin_tool_calendar.desktop
 %{_kde4_datadir}/kde4/services/kspread*module.desktop
 %{_kde4_datadir}/kde4/services/kspread_*_export.desktop
@@ -797,7 +786,6 @@ fi
 %{_kde4_datadir}/templates/.source/SpreadSheet.ods
 %{_kde4_datadir}/applications/kde4/sheets.desktop
 %{_kde4_docdir}/HTML/en/sheets/
-%{_kde4_datadir}/kde4/services/ServiceMenus/kspread_konqi.desktop
 
 %post sheets-libs -p /sbin/ldconfig
 %postun sheets-libs -p /sbin/ldconfig
@@ -836,7 +824,6 @@ fi
 %{_kde4_datadir}/applications/kde4/*stage.desktop
 %{_kde4_datadir}/kde4/services/Filterkpr2odf.desktop
 %{_kde4_datadir}/kde4/services/stagepart.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kpresenter_konqi.desktop
 
 %post stage-libs -p /sbin/ldconfig
 %postun stage-libs -p /sbin/ldconfig
@@ -867,7 +854,6 @@ fi
 %{_kde4_datadir}/templates/.source/Illustration.odg
 %{_kde4_datadir}/applications/kde4/*karbon.desktop
 #{_kde4_docdir}/HTML/en/karbon/
-%{_kde4_datadir}/kde4/services/ServiceMenus/karbon_konqi.desktop
 
 %post karbon-libs -p /sbin/ldconfig
 %postun karbon-libs -p /sbin/ldconfig
@@ -901,7 +887,6 @@ fi
 %{_kde4_datadir}/mime/packages/krita_ora.xml
 %{_kde4_appsdir}/kritaplugins/
 %{_datadir}/color/icc/krita/
-%{_kde4_datadir}/kde4/services/ServiceMenus/krita_konqi.desktop
 
 %post krita-libs -p /sbin/ldconfig
 %postun krita-libs -p /sbin/ldconfig
@@ -1000,7 +985,6 @@ fi
 %{_kde4_datadir}/kde4/services/flow*.desktop
 %{_kde4_datadir}/applications/kde4/flow.desktop
 %{_kde4_configdir}/flowrc
-%{_kde4_datadir}/kde4/services/ServiceMenus/flow_konqi.desktop
 %{_kde4_datadir}/kde4/servicetypes/flow_dock.desktop
 
 %post flow-libs -p /sbin/ldconfig
@@ -1073,17 +1057,14 @@ fi
 %{_kde4_datadir}/templates/TextDocument.desktop
 %{_kde4_datadir}/templates/.source/TextDocument.odt
 %{_kde4_datadir}/applications/kde4/words.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/words_konqi.desktop
 %{_kde4_datadir}/kde4/services/wordspart.desktop
 %{_kde4_libdir}/kde4/applixwordimport.*
 %{_kde4_libdir}/kde4/asciiimport.so
 %{_kde4_libdir}/kde4/docximport.*
-%{_kde4_libdir}/kde4/htmlodf_export.*
 %{_kde4_libdir}/kde4/mswordodf_import.*
 %{_kde4_libdir}/kde4/rtfimport.*
 %{_kde4_libdir}/kde4/wpgimport.*
 %{_kde4_libdir}/kde4/wpsimport.*
-%{_kde4_datadir}/kde4/services/html-odf_export.desktop
 %{_kde4_datadir}/kde4/services/words_*_import.desktop
 
 %post words-libs -p /sbin/ldconfig
@@ -1100,6 +1081,9 @@ fi
 
 
 %changelog
+* Wed Oct 24 2012 Rex Dieter <rdieter at fedoraproject.org> 2.5.91-1
+- 2.5.91
+
 * Mon Oct 08 2012 Rex Dieter <rdieter at fedoraproject.org> 2.5.3-1
 - 2.5.3
 
diff --git a/sources b/sources
index 484fd63..187b68f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83e2679b7ecb923b953ace06db7ca4c2  calligra-2.5.3.tar.bz2
+a9060c87ede914ec67fabd51748ab163  calligra-2.5.91.tar.bz2