rpms/koffice/devel .cvsignore, 1.22, 1.23 koffice.spec, 1.85, 1.86 sources, 1.22, 1.23

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11202

Modified Files:
	.cvsignore koffice.spec sources 
Log Message:
* Fri Dec 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.3-1
- koffice-1.9.98.3 (koffice2 beta4)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	12 Nov 2008 20:35:06 -0000	1.22
+++ .cvsignore	6 Dec 2008 01:55:26 -0000	1.23
@@ -1 +1 @@
-koffice-1.9.98.2.tar.bz2
+koffice-1.9.98.3.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- koffice.spec	4 Dec 2008 23:36:46 -0000	1.85
+++ koffice.spec	6 Dec 2008 01:55:26 -0000	1.86
@@ -3,11 +3,12 @@
 #define kexi 1
 #define kformula 1
 #define kivio 1
+#define kugar 1
 
 Name:           koffice
 Epoch:          1
-Version:        1.9.98.2
-Release:        4%{?dist}
+Version:        1.9.98.3
+Release:        1%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -22,7 +23,6 @@
 #+ OpenCTL, 0.9.2: OpenCTL is needed for some color spaces (High Dynamic Range Color Spaces, YCbCr and LMS) <http://www.openctl.org>
 #+ FreeTDS library: Kexi Sybase Migration driver requires FreeTDS library. The driver will not be built <http://www.freetds.org>
 #+ XBase library: Kexi XBase Migration driver requires XBase library. The driver will not be built <http://linux.techass.com/projects/xdb/>
-#+ GMM: The Krita Panorama plugin will not be built. <http://home.gna.org/getfem/download.html>
 #+ Spnav: Spnav is the library which is required by the space navigator device plugin <http://spacenav.sourceforge.net/>
 
 BuildRequires: boost-devel
@@ -38,6 +38,7 @@
 BuildRequires: gettext-devel
 BuildRequires: giflib-devel
 BuildRequires: glew-devel
+BuildRequires: gmm-devel
 BuildRequires: GraphicsMagick-devel
 BuildRequires: gsl-devel
 BuildRequires: kdelibs4-devel
@@ -81,7 +82,9 @@
 %endif
 Requires:       %{name}-karbon = %{epoch}:%{version}-%{release}
 Requires:       %{name}-krita = %{epoch}:%{version}-%{release}
+%if 0%{?kugar}
 Requires:       %{name}-kugar = %{epoch}:%{version}-%{release}
+%endif
 %if 0%{?kexi}
 Requires:       %{name}-kexi = %{epoch}:%{version}-%{release}
 Requires:       %{name}-kexi-driver-mysql = %{epoch}:%{version}-%{release}
@@ -116,9 +119,12 @@
 %if ! 0%{?kivio}
 Obsoletes: koffice-kivio < %{epoch}:%{version}-%{release}
 %endif
-%if !0%{?kformula}
+%if ! 0%{?kformula}
 Obsoletes: koffice-kformula < %{epoch}:%{version}-%{release}
 %endif
+%if ! 0%{?kukar}
+Obsoletes: koffice-kugar < %{epoch}:%{version}-%{release}
+%endif
 
 %description core
 %{summary}.
@@ -384,7 +390,6 @@
 %{_kde4_libdir}/kde4/textvariables.so
 %{_kde4_appsdir}/koffice/
 %{_kde4_docdir}/HTML/en/koffice/
-%{_kde4_docdir}/HTML/en/koshell/
 %{_kde4_docdir}/HTML/en/thesaurus/
 %{_kde4_datadir}/applications/kde4/KThesaurus.desktop
 %{_kde4_datadir}/icons/hicolor/*/*/*
@@ -537,7 +542,6 @@
 %{_kde4_libdir}/libkdeinit4_krita.so
 %{_kde4_libdir}/libkrita*.so.*
 %{_kde4_libdir}/libKrita*.so
-%{_kde4_libdir}/libkisexiv2.so.*
 %{_kde4_libdir}/kde4/*krita*.*
 %{_kde4_libdir}/libkrossmodulekrita.so.*
 %{_kde4_appsdir}/krita/
@@ -551,9 +555,11 @@
 %{_datadir}/color/icc/krita/
 %{_kde4_datadir}/kde4/services/ServiceMenus/krita_konqi.desktop
 
+%if 0%{?kexi}
 %files kugar
 %defattr(-,root,root,-)
 %{_kde4_docdir}/HTML/en/kugar/
+%endif
 
 %if 0%{?kexi}
 %files kexi
@@ -682,21 +688,16 @@
 %files kplato
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kplato
-%{_kde4_bindir}/kplatowork
 %{_kde4_configdir}/kplatorc
 %{_kde4_libdir}/libkdeinit4_kplato.so
-%{_kde4_libdir}/libkdeinit4_kplatowork.so
 %{_kde4_libdir}/kde4/libkplatopart.*
-%{_kde4_libdir}/kde4/libkplatoworkpart.so
 %{_kde4_libdir}/libkplato*.so.*
 %{_kde4_libdir}/kde4/krossmodulekplato.so
 %{_kde4_datadir}/kde4/services/krossmodulekplato.desktop
 %{_kde4_appsdir}/kplato/
-%{_kde4_appsdir}/kplatowork
 %{_kde4_docdir}/HTML/en/kplato/
 %{_kde4_datadir}/kde4/services/kplato*.desktop
 %{_kde4_datadir}/applications/kde4/kplato.desktop
-%{_kde4_datadir}/applications/kde4/kplatowork.desktop
 
 %files kword
 %defattr(-,root,root,-)
@@ -715,6 +716,9 @@
 
 
 %changelog
+* Fri Dec 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.3-1
+- koffice-1.9.98.3 (koffice2 beta4)
+
 * Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:1.9.98.2-4
 - Rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	12 Nov 2008 20:35:06 -0000	1.22
+++ sources	6 Dec 2008 01:55:26 -0000	1.23
@@ -1 +1 @@
-cd29d9979f11862fdb2162e34601b03c  koffice-1.9.98.2.tar.bz2
+900ecf56b62bb8dfaea5e32c9ded3ddc  koffice-1.9.98.3.tar.bz2