rpms/koffice/devel .cvsignore, 1.21, 1.22 koffice.spec, 1.78, 1.79 sources, 1.21, 1.22

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore koffice.spec sources 
Log Message:
* Tue Nov 11 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.2-1
- koffice-1.9.98.2 (koffice2 beta2)
- kchart awol



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	11 Oct 2008 20:59:09 -0000	1.21
+++ .cvsignore	12 Nov 2008 20:35:06 -0000	1.22
@@ -1 +1 @@
-koffice-1.9.98.1.tar.bz2
+koffice-1.9.98.2.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- koffice.spec	11 Oct 2008 20:59:09 -0000	1.78
+++ koffice.spec	12 Nov 2008 20:35:06 -0000	1.79
@@ -1,11 +1,12 @@
 
+#define kchart 1
 #define kexi 1
 #define kformula 1
 #define kivio 1
 
 Name:           koffice
 Epoch:          1
-Version:        1.9.98.1
+Version:        1.9.98.2
 Release:        1%{?dist}
 Summary:        An integrated office suite
 
@@ -86,7 +87,9 @@
 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}
+%endif
 %if 0%{?kformula}
 Requires:       %{name}-kformula = %{epoch}:%{version}-%{release}
 %endif
@@ -102,6 +105,9 @@
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
+%if ! 0%{?kchart}
+Obsoletes: koffice-kchart < %{epoch}:%{version}-%{release}
+%endif
 %if ! 0%{?kexi}
 Obsoletes: koffice-kexi < %{epoch}:%{version}-%{release}
 Obsoletes: koffice-kexi-driver-mysql < %{epoch}:%{version}-%{release}
@@ -215,6 +221,7 @@
 %description kexi-driver-pgsql
 %{summary}
 
+%if 0%{?kchart}
 %package kchart
 Summary:        An integrated graph and chart drawing tool
 Group:          Applications/Productivity
@@ -222,6 +229,7 @@
 
 %description kchart
 %{summary}
+%endif
 
 %package kformula
 Summary:        A powerful formula editor
@@ -283,14 +291,25 @@
 rm -f %{buildroot}%{_kde4_libdir}/libkword*.so
 rm -f %{buildroot}%{_kde4_libdir}/libkrita*.so
 rm -f %{buildroot}%{_kde4_libdir}/libkross*.so
+%if ! 0%{?kchart}
+rm -f %{buildroot}%{_kde4_libdir}/libkchartcommon.so.*
+rm -f %{buildroot}%{_kde4_libdir}/kde4/*kchart*.*
+rm -rf %{buildroot}%{_kde4_appsdir}/kchart/
+rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kchart/
+rm -f %{buildroot}%{_kde4_datadir}/kde4/services/kchart*.desktop
+rm -f %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kchart_konqi.desktop
+%endif
 %if ! 0%{?kexi}
 rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kexi/
+rm -f %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kexi_konqi.desktop
 %endif
 %if ! 0%{?kformula}
 rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kformula/
+rm -f %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
 %endif
 %if ! 0%{?kivio}
 rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kivio/
+rm -f %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kivio_konqi.desktop
 %endif
 
 
@@ -320,8 +339,10 @@
 %post kexi -p /sbin/ldconfig
 %postun kexi -p /sbin/ldconfig
 
+%if 0%{?kchart}
 %post kchart -p /sbin/ldconfig
 %postun kchart -p /sbin/ldconfig
+%endif
 
 %post filters -p /sbin/ldconfig
 %postun filters -p /sbin/ldconfig 
@@ -565,18 +586,21 @@
 %{_kde4_datadir}/kde4/services/keximigrate_pqxx.desktop
 %endif
 
+%if 0%{?kchart}
 %files kchart
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kchart
+## Some parts of kchart went awol 1.9.98.1 -> 1.9.98.2, bug?
+#{_kde4_bindir}/kchart
 %{_kde4_libdir}/libkchartcommon.so.*
-%{_kde4_libdir}/libkdeinit4_kchart.so
+#{_kde4_libdir}/libkdeinit4_kchart.so
 %{_kde4_libdir}/kde4/*kchart*.*
 %{_kde4_appsdir}/kchart/
 %{_kde4_datadir}/config.kcfg/kchart.kcfg
 %{_kde4_datadir}/kde4/services/kchart*.desktop
 %{_kde4_docdir}/HTML/en/kchart/
-%{_kde4_datadir}/applications/kde4/*kchart.desktop
+#{_kde4_datadir}/applications/kde4/*kchart.desktop
 %{_kde4_datadir}/kde4/services/ServiceMenus/kchart_konqi.desktop
+%endif
 
 %if 0%{?kformula}
 %files kformula
@@ -685,15 +709,19 @@
 
 
 %changelog
+* Tue Nov 11 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.2-1
+- koffice-1.9.98.2 (koffice2 beta2)
+- kchart awol
+
 * Thu Oct 09 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.1-1
-- - koffice-1.9.98.1 (aka koffice2 beta2)
+- koffice-1.9.98.1 (koffice2 beta2)
 
 * Wed Oct 08 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.0-2
 - -krita: move %%{_kde4_libdir}/libKrita*.so here
 - BR: libkdcraw-devel >= 0.2.0
 
 * Thu Sep 25 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.0-1
-- koffice-1.9.98.0 (aka koffice2 beta1)
+- koffice-1.9.98.0 (koffice2 beta1)
 - Epoch: 1
 
 * Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.10-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	11 Oct 2008 20:59:09 -0000	1.21
+++ sources	12 Nov 2008 20:35:06 -0000	1.22
@@ -1 +1 @@
-97e4170a6d105f29c0e817cf2ea4a796  koffice-1.9.98.1.tar.bz2
+cd29d9979f11862fdb2162e34601b03c  koffice-1.9.98.2.tar.bz2