rpms/koffice/F-13 koffice.spec,1.151,1.152

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/koffice/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8399/F-13

Modified Files:
	koffice.spec 
Log Message:
Sync from devel:

* Wed May 12 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3:2.1.91-6
- don't obsolete koffice-kivio


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-13/koffice.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- koffice.spec	12 May 2010 14:45:43 -0000	1.151
+++ koffice.spec	18 May 2010 21:58:21 -0000	1.152
@@ -21,7 +21,7 @@
 Name:           koffice
 Epoch:          3 
 Version:        2.1.91
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -165,9 +165,6 @@ Obsoletes: koffice-kexi-libs < %{epoch}:
 Obsoletes: koffice-kexi-driver-mysql < %{epoch}:%{version}-%{release}
 Obsoletes: koffice-kexi-driver-pgsql < %{epoch}:%{version}-%{release}
 %endif
-%if ! 0%{?kivio}
-Obsoletes: koffice-kivio < %{epoch}:%{version}-%{release}
-%endif
 %if ! 0%{?kformula}
 Obsoletes: koffice-kformula < %{epoch}:%{version}-%{release}
 Obsoletes: koffice-kformula-libs < %{epoch}:%{version}-%{release}
@@ -1134,7 +1131,10 @@ fi
 
 
 %changelog
-* Wed May 12 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.1.91-4
+* Wed May 12 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3:2.1.91-6
+- don't obsolete koffice-kivio
+
+* Wed May 12 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.1.91-5
 - better fix for KWord crash on exit (kde#235345)
 
 * Wed May 12 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3:2.1.91-4