[koffice] upstream dropped/disabled standalone kformula, fold kformulashape into core/libs

[Rex Dieter]

commit 205342ffe98101ba914f8e23bfecf70fced418dc
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Feb 19 22:41:22 2011 -0600

    upstream dropped/disabled standalone kformula, fold kformulashape into core/libs

 koffice.spec |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/koffice.spec b/koffice.spec
index 07ba1f3..0e2126f 100644
--- a/koffice.spec
+++ b/koffice.spec
@@ -2,7 +2,7 @@
 #define freoffice 1
 #define kchart 1
 %define kexi 1
-%define kformula 1
+#define kformula 1
 #define kivio 1
 %define kplato 1
 #define kugar 1
@@ -172,6 +172,10 @@ Obsoletes: koffice-kexi-driver-pgsql < %{epoch}:%{version}-%{release}
 Obsoletes: koffice-kformula < %{epoch}:%{version}-%{release}
 Obsoletes: koffice-kformula-libs < %{epoch}:%{version}-%{release}
 %endif
+### kformula fonts
+## cmex10
+Requires: lyx-fonts
+Requires: dejavu-lgc-sans-fonts
 %if ! 0%{?kplato}
 Obsoletes: koffice-kplato < %{epoch}:%{version}-%{release}
 Obsoletes: koffice-kplato-libs < %{epoch}:%{version}-%{release}
@@ -806,6 +810,7 @@ fi
 %{_kde4_datadir}/kde4/services/*shape.desktop
 %if 0%{?kformula}
 %{_kde4_appsdir}/formulashape/
+%{_kde4_libdir}/kde4/formulashape.*
 %endif
 %{_kde4_appsdir}/musicshape/
 %dir %{_datadir}/color/
@@ -830,9 +835,6 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_datadir}/kde4/servicetypes/flake*.desktop
 %{_kde4_libdir}/libflake.so.*
-%if 0%{?kformula}
-%exclude %{_kde4_libdir}/kde4/formulashape.*
-%endif
 %{_kde4_libdir}/libchartshapelib.so.*
 %{_kde4_libdir}/libkochart.so.*
 %{_kde4_libdir}/libkokross.so.*
@@ -851,6 +853,7 @@ fi
 %{_kde4_libdir}/libkwmf.so.*
 %if 0%{?kformula}
 %{_kde4_libdir}/libkformulalib.so.*
+%{_kde4_libdir}/libkformulaprivate.so.*
 %endif
 %{_kde4_libdir}/libmsooxml.so.*
 %{_kde4_libdir}/libpigmentcms.so.*
@@ -1053,16 +1056,17 @@ fi
 #{_kde4_libdir}/libkdchart.so
 %endif
 
-%if 0%{?kformula}
+#if 0%{?kformula}
+%if 0
 %files kformula
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kformula
-%{_kde4_libdir}/libkdeinit_kformula.so
-%{_kde4_libdir}/kde4/*kformula*.*
+#{_kde4_bindir}/kformula
+#{_kde4_libdir}/libkdeinit_kformula.so
+#{_kde4_libdir}/kde4/*kformula*.*
 %{_kde4_libdir}/kde4/formulashape.*
-%{_kde4_appsdir}/kformula/
-%{_kde4_datadir}/kde4/services/kformula*.desktop
-%{_kde4_datadir}/applications/kde4/*kformula.desktop
+#{_kde4_appsdir}/kformula/
+#{_kde4_datadir}/kde4/services/kformula*.desktop
+#{_kde4_datadir}/applications/kde4/*kformula.desktop
 %{_kde4_docdir}/HTML/en/kformula/
 %{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
 
@@ -1204,6 +1208,7 @@ fi
 %changelog
 * Sat Feb 19 2011 Rex Dieter <rdieter at fedoraproject.org> - 3:2.3.2-1
 - koffice-2.3.2
+- upstream dropped/disabled standalone kformula, fold kformulashape into core/libs
 
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3:2.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild