[Fedora-spins] [spin-kickstarts/f17] kde: s/koffice/calligra/

[Kevin Kofler]

commit 8a879a6e77597897fe331cbcfaff6c527e91c896
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Feb 29 11:51:58 2012 -0600

    kde: s/koffice/calligra/

 fedora-live-kde.ks   |    4 ++--
 fedora-livecd-kde.ks |    9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/fedora-live-kde.ks b/fedora-live-kde.ks
index 222dfd7..4c1b5af 100644
--- a/fedora-live-kde.ks
+++ b/fedora-live-kde.ks
@@ -22,7 +22,7 @@ kde-wallpapers
 
 # Additional packages that are not default in kde-desktop but useful
 k3b				# ~15 megs
-koffice-suite
+calligra
 #kdeartwork			# only include some parts of kdeartwork
 #twinkle			# (~10 megs)
 fuse
@@ -60,7 +60,7 @@ octave			# runtime dependency of the Cantor Octave backend
 
 # KDE 4 translations
 kde-l10n-*
-koffice-langpack-*
+calligra-l10n-*
 
 # use yum-presto by default
 yum-presto
diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index 82fc7c4..0b359c9 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -27,11 +27,10 @@
 
 # Additional packages that are not default in kde-desktop but useful
 k3b				# ~15 megs
--koffice-suite			# don't include whole koffice-suite, just parts of it
-koffice-kword
-koffice-kspread			# ~1 megs
-koffice-kpresenter		# ~3 megs
-koffice-filters
+-calligra			# don't include whole calligra, just parts of it
+calligra-words
+calligra-tables			# ~1 megs
+calligra-stage			# ~3 megs
 #kdeartwork			# only include some parts of kdeartwork
 #twinkle			# (~10 megs)
 fuse