[koffice] - koffice-2.2.81

Mon Sep 27 14:41:42 UTC 2010

commit f07da54d0970fc378aec4aefb70bd8758119df19
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 27 09:47:20 2010 -0500

    - koffice-2.2.81

 .gitignore                                         |    2 +-
 fix-crash-on-closing-sqlite-connection-2.2.2.patch |   13 ---
 koffice.spec                                       |  109 ++++++++++++++------
 sources                                            |    2 +-
 support-large-memo-values-for-msaccess-2.2.2.patch |   96 -----------------
 5 files changed, 81 insertions(+), 141 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index dc2d736..8ff1c90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/koffice-2.2.2.tar.bz2
+/koffice-2.2.81.tar.bz2
diff --git a/koffice.spec b/koffice.spec
index 29d513d..297eb5f 100644
--- a/koffice.spec
+++ b/koffice.spec
@@ -1,6 +1,6 @@
 
 #define freoffice 1
-%define kchart 1
+#define kchart 1
 %define kexi 1
 %define kformula 1
 #define kivio 1
@@ -20,8 +20,8 @@
 
 Name:           koffice
 Epoch:          3 
-Version:        2.2.2
-Release:        4%{?dist}
+Version:        2.2.81
+Release:        1%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -34,29 +34,28 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ## upstreamable patches
 
 ## upstream patches
-# http://bugs.kde.org/show_bug.cgi?id=245030
-Patch100: http://kexi-project.org/download/patches/2.2.2/fix-crash-on-closing-sqlite-connection-2.2.2.patch
-# http://bugs.kde.org/show_bug.cgi?id=244420
-Patch101: http://kexi-project.org/download/patches/2.2.2/support-large-memo-values-for-msaccess-2.2.2.patch
 
 #-- The following OPTIONAL packages could NOT be located on your system.
 #-- Consider installing them to enable more features from this software.
 #-----------------------------------------------------------------------------
 #   * Create Resources  <http://create.freedesktop.org>
 #     Create Resources (brushes, palettes etc.)
-#     Required by KOffice for optional extra resources.
-#   * LibRCPS (0.2 or higher)  <http://www.librcps.org>
+#     Recommended at runtime for KOffice for optional extra resources.
+#   * XBase  <http://linux.techass.com/projects/xdb/>
+#     XBase compatible C++ class library
+#     Required by Kexi XBase Migration driver
+#   * LibRCPS (0.3 or higher)  <http://www.librcps.org>
 #     Resource Conflict Project Scheduling Library
 #     Required by KPlato RCPS Plugin
-#   * QtShiva  <http://www.openshiva.org>
-#     Qt bindings for the OpenShiva interpreter
-#     Required for Shiva based Generators and Filters
+#   * LittleCMS (2.0 or higher)  <http://www.littlecms.com>
+#     Color management engine
+#     Required for color management and Krita
 #   * Spnav  <http://spacenav.sourceforge.net/>
 #     3Dconnexion device driver and SDK
 #     Required by SpaceNavigator 3D mouse plugin
-#   * WPG  <http://libwpg.sourceforge.net/>
-#     WordPerfect Graphics Library
-#     Required by the Karbon WPG import filter
+#   * DCMTK  <http://dicom.offis.de/dcmtk.php.en>
+#     DICOM document processing toolkit
+#     Required for processing DICOM structured reports
 
 BuildRequires: boost-devel
 BuildRequires: bzip2-devel bzip2
@@ -75,6 +74,7 @@ BuildRequires: glew-devel
 BuildRequires: gmm-devel
 BuildRequires: GraphicsMagick-devel
 BuildRequires: gsl-devel
+BuildRequires: kdegraphics-devel
 BuildRequires: kdelibs4-devel
 BuildRequires: kdepimlibs-devel
 BuildRequires: lcms-devel
@@ -126,8 +126,8 @@ Requires:       %{name}-kugar = %{epoch}:%{version}-%{release}
 %endif
 %if 0%{?kexi}
 Requires:       %{name}-kexi = %{epoch}:%{version}-%{release}
-#Requires:       %{name}-kexi-driver-mysql = %{epoch}:%{version}-%{release}
-#Requires:       %{name}-kexi-driver-pgsql = %{epoch}:%{version}-%{release}
+Requires:       %{name}-kexi-driver-mysql = %{epoch}:%{version}-%{release}
+Requires:       %{name}-kexi-driver-pgsql = %{epoch}:%{version}-%{release}
 %endif
 %if 0%{?kchart}
 Requires:       %{name}-kchart = %{epoch}:%{version}-%{release}
@@ -139,7 +139,7 @@ Requires:       %{name}-filters = %{epoch}:%{version}-%{release}
 %if 0%{?kplato}
 Requires:       %{name}-kplato = %{epoch}:%{version}-%{release}
 %endif
-
+Requires:	%{name}-okular-odpgenerator = %{epoch}:%{version}-%{release}
 %description suite
 KOffice is an integrated office suite.
 
@@ -175,7 +175,6 @@ Obsoletes: koffice-kplato-libs < %{epoch}:%{version}-%{release}
 %if ! 0%{?kukar}
 Obsoletes: koffice-kugar < %{epoch}:%{version}-%{release}
 %endif
-
 %description core
 %{summary}.
 
@@ -456,6 +455,15 @@ Requires:        %{name}-kplato = %{epoch}:%{version}-%{release}
 %description kplato-libs
 %{summary}.
 
+%package okular-odpgenerator
+Summary:	OpenDocument presenter support for okular
+Group:		Applications/Productivity
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+# okular
+Requires:	kdegraphics%{?_kde4_version: >= %{_kde4_version}}
+%description okular-odpgenerator
+%{summary}.
+
 %package -n wv2
 Summary:	A library which allows access to Microsoft Word files
 Group:		System Environment/Libraries
@@ -484,11 +492,8 @@ Requires:       libxml2-devel
 %prep
 %setup -q
 
-%patch100 -p0 -b .kexi_sqlite
-%patch101 -p0 -b .kexi_msaccess
-
 ## kdchart munging begin
-pushd kchart/kdchart
+pushd plugins/chartshape/kdchart
 mv src kdchart
 sed -i.kdchart_fix -e 's|../src/||' kdchart/Ternary/KDChartTernaryAxis.cpp
 sed -i.kdchart_fix -e 's|add_subdirectory(src)|add_subdirectory(kdchart)|' CMakeLists.txt
@@ -519,8 +524,7 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-## kdchart munging begin
-pushd kchart/kdchart
+pushd plugins/chartshape/kdchart
 mkdir -p %{buildroot}%{_includedir}/KDChart
 install -m644 -p include/* %{buildroot}%{_includedir}/KDChart/
 for inc_dir in kdchart kdchart/LeveyJennings kdchart/PrerenderedElements kdchart/Scenery kdchart/Ternary ; do
@@ -557,6 +561,7 @@ rm -fv %{buildroot}%{_kde4_libdir}/libkplato*.so
 rm -fv %{buildroot}%{_kde4_libdir}/libkword*.so
 rm -fv %{buildroot}%{_kde4_libdir}/libkrita*.so
 rm -fv %{buildroot}%{_kde4_libdir}/libkross*.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkspreadodf.so
 rm -fv %{buildroot}%{_kde4_libdir}/libkwmf.so
 rm -fv %{buildroot}%{_kde4_libdir}/libmsooxml.so
 rm -fv %{buildroot}%{_libdir}/libwv2.la
@@ -671,6 +676,19 @@ fi
 %post krita-libs -p /sbin/ldconfig
 %postun krita-libs -p /sbin/ldconfig
 
+%posttrans kspread
+update-desktop-database -q &> /dev/null ||:
+update-mime-database %{_kde4_datadir}/mime &> /dev/null ||:
+
+%postun kspread
+if [ $1 -eq 0 ] ; then
+update-desktop-database -q &> /dev/null ||:
+update-mime-database %{_kde4_datadir}/mime &> /dev/null ||:
+fi
+
+%post kspread-libs -p /sbin/ldconfig
+%postun kspread-libs -p /sbin/ldconfig
+
 %posttrans kugar
 update-desktop-database -q &> /dev/null ||:
 
@@ -726,8 +744,12 @@ fi
 %{_kde4_libdir}/kde4/kofficethumbnail.*
 %{_kde4_libdir}/kde4/kopabackgroundtool.*
 %{_kde4_libdir}/kde4/kofficedockers.*
+%{_kde4_libdir}/kde4/kofficegoogledocs.*
 #{_kde4_libdir}/kde4/kofficesimpletextedit.*
 %{_kde4_libdir}/kde4/kolcmsengine.*
+%{_kde4_libdir}/kde4/koreport_barcodeplugin.so
+%{_kde4_libdir}/kde4/koreport_chartplugin.so
+%{_kde4_libdir}/kde4/koreport_shapeplugin.so
 %{_kde4_libdir}/kde4/libkounavailpart.*
 %{_kde4_libdir}/kde4/paragraphtool.so
 %{_kde4_libdir}/kde4/spellcheck.so
@@ -735,11 +757,14 @@ fi
 %{_kde4_libdir}/kde4/thesaurustool.so
 %{_kde4_libdir}/kde4/artistictextshape.so
 %{_kde4_libdir}/kde4/chartshape.so
+%{_kde4_libdir}/kde4/commentshape.so
 %{_kde4_libdir}/kde4/divineproportionshape.so
 %{_kde4_libdir}/kde4/musicshape.so
 %{_kde4_libdir}/kde4/pictureshape.so
+%{_kde4_libdir}/kde4/pluginshape.so
 %{_kde4_libdir}/kde4/spreadsheetshape.so
 %{_kde4_libdir}/kde4/textshape.so
+%{_kde4_libdir}/kde4/treeshape.so
 %{_kde4_libdir}/kde4/vectorshape.so
 %{_kde4_libdir}/kde4/videoshape.so
 %{_kde4_appsdir}/koffice/
@@ -752,22 +777,27 @@ fi
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_datadir}/kde4/services/autocorrect.desktop
 %{_kde4_datadir}/kde4/services/changecase.desktop
+%{_kde4_datadir}/kde4/services/commenttool.desktop
 %{_kde4_datadir}/kde4/services/defaulttools.desktop
 %{_kde4_datadir}/kde4/services/kofficethumbnail.desktop
 %{_kde4_datadir}/kde4/services/kofficedockers.desktop
 %{_kde4_datadir}/kde4/services/kolcmsengine.desktop
 %{_kde4_datadir}/kde4/services/kopabackgroundtool.desktop
+%{_kde4_datadir}/kde4/services/koreport_barcodeplugin.desktop
+%{_kde4_datadir}/kde4/services/koreport_chartplugin.desktop
+%{_kde4_datadir}/kde4/services/koreport_shapeplugin.desktop
 %{_kde4_datadir}/kde4/services/kounavail.desktop
 %{_kde4_datadir}/kde4/services/paragraphtool.desktop
 %{_kde4_datadir}/kde4/services/spellcheck.desktop
 %{_kde4_datadir}/kde4/services/textvariables.desktop
 %{_kde4_datadir}/kde4/services/thesaurustool.desktop
 %{_kde4_datadir}/kde4/servicetypes/filtereffect.desktop
+%{_kde4_datadir}/kde4/servicetypes/inlinetextobject.desktop
 %{_kde4_datadir}/kde4/servicetypes/kochart.desktop
 %{_kde4_datadir}/kde4/servicetypes/kofficedocker.desktop
 %{_kde4_datadir}/kde4/servicetypes/kofficepart.desktop
 %{_kde4_datadir}/kde4/servicetypes/koplugin.desktop
-%{_kde4_datadir}/kde4/servicetypes/inlinetextobject.desktop
+%{_kde4_datadir}/kde4/servicetypes/koreport_itemplugin.desktop
 %{_kde4_datadir}/kde4/servicetypes/texteditingplugin.desktop
 %{_kde4_datadir}/kde4/servicetypes/textvariableplugin.desktop
 %{_kde4_datadir}/kde4/servicetypes/widgetfactory.desktop
@@ -795,7 +825,6 @@ fi
 %{_datadir}/dbus-1/services/com.nokia.FreOffice.service
 %endif
 
-
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_datadir}/kde4/servicetypes/flake*.desktop
@@ -879,6 +908,10 @@ fi
 %{_kde4_datadir}/kde4/servicetypes/kspread_plugin.desktop
 %{_kde4_docdir}/HTML/en/kspread/
 
+%files kspread-libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libkspreadodf.so.7*
+
 %files kpresenter
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kpresenter
@@ -934,6 +967,7 @@ fi
 %{_kde4_libdir}/libkrossmodulekrita.so.*
 %{_kde4_libdir}/kde4/*krita*.*
 %{_kde4_appsdir}/krita/
+%{_kde4_configdir}/krita.knsrc
 %{_kde4_datadir}/kde4/services/krita*.desktop
 %{_kde4_datadir}/kde4/servicetypes/krita*.desktop
 %{_kde4_datadir}/applications/kde4/*krita*.desktop
@@ -961,6 +995,7 @@ fi
 %{_kde4_libdir}/kde4/kexihandler_*.*
 %{_kde4_libdir}/kde4/krossmodulekexidb.so
 %{_kde4_libdir}/kde4/kexidb_sqlite3driver.so
+%{_kde4_libdir}/kde4/kexidb_sybasedriver.so
 %{_kde4_libdir}/kde4/keximigrate_kspread.so
 %{_kde4_libdir}/kde4/keximigrate_mdb.so
 %{_kde4_libdir}/kde4/keximigrate_sybase.so
@@ -975,6 +1010,7 @@ fi
 %{_kde4_datadir}/kde4/services/keximigrate_sybase.desktop
 %{_kde4_datadir}/kde4/services/keximigrate_txt.desktop
 %{_kde4_datadir}/kde4/services/kexidb_sqlite3driver.desktop
+%{_kde4_datadir}/kde4/services/kexidb_sybasedriver.desktop
 %{_kde4_datadir}/kde4/services/kformdesigner/*
 %{_kde4_docdir}/HTML/en/kexi/
 
@@ -1026,13 +1062,13 @@ fi
 %if 0%{?kformula}
 %files kformula
 %defattr(-,root,root,-)
-#{_kde4_bindir}/kformula
-#{_kde4_libdir}/libkdeinit_kformula.so
+%{_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_datadir}/applications/kde4/*kformula.desktop
 %{_kde4_docdir}/HTML/en/kformula/
 %{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
 
@@ -1071,9 +1107,11 @@ fi
 %{_kde4_libdir}/kde4/libdocbookexport.*
 %{_kde4_libdir}/kde4/libdocximport.*
 %{_kde4_libdir}/kde4/libexcelimport.*
+%{_kde4_libdir}/kde4/libexcelimporttodoc.*
 %{_kde4_libdir}/kde4/libgenerickofilter.*
 %{_kde4_libdir}/kde4/libhtmlexport.*
 %{_kde4_libdir}/kde4/libhtmlimport.*
+%{_kde4_libdir}/kde4/libhtmlodf_export.*
 %{_kde4_libdir}/kde4/libkspreadlatexexport.*
 %{_kde4_libdir}/kde4/libkspreadhtmlimport.*
 %{_kde4_libdir}/kde4/libkwordkword1dot3import.*
@@ -1097,6 +1135,7 @@ fi
 %{_kde4_libdir}/kde4/libhancomwordimport.*
 %{_kde4_appsdir}/xsltfilter/
 %{_kde4_datadir}/kde4/services/generic_filter.desktop
+%{_kde4_datadir}/kde4/services/html-odf_export.desktop
 %{_kde4_datadir}/kde4/services/xslt*.desktop
 %{_kde4_datadir}/kde4/servicetypes/kofilter*.desktop
 
@@ -1148,6 +1187,13 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libkwordprivate.so.*
 
+%files okular-odpgenerator
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/okularGenerator_odp.so
+%{_kde4_datadir}/applications/kde4/okularApplication_odp.desktop
+%{_kde4_datadir}/kde4/services/libokularGenerator_odp.desktop
+%{_kde4_datadir}/kde4/services/okularOdp.desktop
+
 %if 0%{?wv2}
 %files -n wv2
 %defattr(-,root,root,-)
@@ -1163,6 +1209,9 @@ fi
 
 
 %changelog
+* Sun Sep 26 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.2.81-1
+- koffice-2.2.81
+
 * Tue Sep 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.2.2-4
 - The desktop entry file .../koffice.desktop has Type=Application 
   but no Exec line (#631183)
diff --git a/sources b/sources
index 10428c3..d87882d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f987ef488888311db04f313ef2c1ed74  koffice-2.2.2.tar.bz2
+cc06705b644552e3a87c2e5fc7eedb18  koffice-2.2.81.tar.bz2
