From c022150966a79e6fe36f6764c149934f3255232d Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Thu, 30 Oct 2008 18:24:09 +1000
Subject: [PATCH] Cleanup input method packages

Remove m17n* and scim* from local spins.
---
 fedora-livecd-broffice.org.ks         | 8 ++------
 fedora-livecd-desktop-de_CH.ks        | 3 +++
 fedora-livecd-desktop-de_DE.ks        | 3 +++
 fedora-livecd-desktop-en_US.ks        | 5 +++++
 fedora-livecd-desktop-nl_NL.ks        | 3 +++
 fedora-livecd-desktop-pt_BR.ks        | 3 +++
 fedora-livecd-desktop-pt_PT.ks        | 3 +++
 fedora-livecd-education-math.ks       | 8 +++-----
 fedora-livecd-electronic-lab-de_CH.ks | 3 +++
 fedora-livecd-electronic-lab-nl_NL.ks | 3 +++
 fedora-livecd-electronic-lab-pt_PT.ks | 3 +++
 fedora-livecd-kde-de_CH.ks            | 4 +++-
 fedora-livecd-kde-de_DE.ks            | 8 +++-----
 fedora-livecd-kde-nl_NL.ks            | 3 +++
 fedora-livecd-kde-pt_PT.ks            | 3 +++
 fedora-livecd-xfce-de_CH.ks           | 3 +++
 fedora-livecd-xfce-nl_NL.ks           | 3 +++
 fedora-livecd-xfce-pt_PT.ks           | 3 +++
 fedora-livecd-xfce.ks                 | 4 ----
 fedora-livedvd-developer-de_CH.ks     | 3 +++
 fedora-livedvd-developer-nl_NL.ks     | 3 +++
 fedora-livedvd-developer-pt_PT.ks     | 3 +++
 fedora-livedvd-games-de_CH.ks         | 3 +++
 fedora-livedvd-games-nl_NL.ks         | 3 +++
 fedora-livedvd-games-pt_PT.ks         | 3 +++
 25 files changed, 73 insertions(+), 21 deletions(-)

diff --git a/fedora-livecd-broffice.org.ks b/fedora-livecd-broffice.org.ks
index 58d5c77..5fcb2f9 100644
--- a/fedora-livecd-broffice.org.ks
+++ b/fedora-livecd-broffice.org.ks
@@ -41,13 +41,9 @@ broffice.org-draw
 -un-core-fonts-*
 -smc-fonts-meera
 
-# Assure we won't get these input methods
--libchewing
--anthy
--kasumi
--iok
--scim*
+# exclude input methods
 -m17n*
+-scim*
 
 # Saving space in order to get BrOffice.org in
 -gnome-utils
diff --git a/fedora-livecd-desktop-de_CH.ks b/fedora-livecd-desktop-de_CH.ks
index 7109931..cef1367 100644
--- a/fedora-livecd-desktop-de_CH.ks
+++ b/fedora-livecd-desktop-de_CH.ks
@@ -12,6 +12,9 @@ timezone Europe/Zurich
 %packages
 -gnome-blog
 @german-support
+# exclude input methods
+-m17n*
+-scim*
 %end
 
 %post
diff --git a/fedora-livecd-desktop-de_DE.ks b/fedora-livecd-desktop-de_DE.ks
index 2f67742..fa46a77 100644
--- a/fedora-livecd-desktop-de_DE.ks
+++ b/fedora-livecd-desktop-de_DE.ks
@@ -12,6 +12,9 @@ timezone Europe/Berlin
 %packages
 -gnome-blog
 @german-support
+# exclude input methods
+-m17n*
+-scim*
 %end
 
 %post
diff --git a/fedora-livecd-desktop-en_US.ks b/fedora-livecd-desktop-en_US.ks
index 33670de..502263f 100644
--- a/fedora-livecd-desktop-en_US.ks
+++ b/fedora-livecd-desktop-en_US.ks
@@ -9,3 +9,8 @@ lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
 
+%packages
+# exclude input methods
+-m17n*
+-scim*
+%end
diff --git a/fedora-livecd-desktop-nl_NL.ks b/fedora-livecd-desktop-nl_NL.ks
index 7c53041..ba9116c 100644
--- a/fedora-livecd-desktop-nl_NL.ks
+++ b/fedora-livecd-desktop-nl_NL.ks
@@ -11,4 +11,7 @@ timezone Europe/Amsterdam
 
 %packages
 @dutch-support
+# exclude input methods
+-m17n*
+-scim*
 %end
diff --git a/fedora-livecd-desktop-pt_BR.ks b/fedora-livecd-desktop-pt_BR.ks
index 6b77e5e..9499318 100644
--- a/fedora-livecd-desktop-pt_BR.ks
+++ b/fedora-livecd-desktop-pt_BR.ks
@@ -11,6 +11,9 @@ timezone America/Sao_Paulo
 
 %packages
 @brazilian-support
+# exclude input methods
+-m17n*
+-scim*
 %end
 
 %post
diff --git a/fedora-livecd-desktop-pt_PT.ks b/fedora-livecd-desktop-pt_PT.ks
index f70c1dd..1595870 100644
--- a/fedora-livecd-desktop-pt_PT.ks
+++ b/fedora-livecd-desktop-pt_PT.ks
@@ -11,4 +11,7 @@ timezone Europe/Lisbon
 
 %packages
 @portuguese-support
+# exclude input methods
+-m17n*
+-scim*
 %end
diff --git a/fedora-livecd-education-math.ks b/fedora-livecd-education-math.ks
index b2a7894..62c9053 100644
--- a/fedora-livecd-education-math.ks
+++ b/fedora-livecd-education-math.ks
@@ -68,17 +68,15 @@ fuse
 
 # FIXME/TODO: recheck the removals here
 # try to remove some packages from livecd-fedora-base-desktop.ks
--scim*
 -gdm
 -authconfig-gtk
--m17n*
 -PolicyKit-gnome
 -gnome-doc-utils-stylesheets
--anthy
--kasumi
 -pygtkglext
 -python-devel
--libchewing
+# exclude input methods
+-scim*
+-m17n*
 
 # save some space (from @base)
 -make
diff --git a/fedora-livecd-electronic-lab-de_CH.ks b/fedora-livecd-electronic-lab-de_CH.ks
index a2456f6..01b9fd1 100644
--- a/fedora-livecd-electronic-lab-de_CH.ks
+++ b/fedora-livecd-electronic-lab-de_CH.ks
@@ -11,4 +11,7 @@ timezone Europe/Zurich
 
 %packages
 @german-support
+# exclude input methods
+-m17n*
+-scim*
 %end
diff --git a/fedora-livecd-electronic-lab-nl_NL.ks b/fedora-livecd-electronic-lab-nl_NL.ks
index c623ca5..afdad2c 100644
--- a/fedora-livecd-electronic-lab-nl_NL.ks
+++ b/fedora-livecd-electronic-lab-nl_NL.ks
@@ -11,4 +11,7 @@ timezone Europe/Amsterdam
 
 %packages
 @dutch-support
+# exclude input methods
+-m17n*
+-scim*
 %end
diff --git a/fedora-livecd-electronic-lab-pt_PT.ks b/fedora-livecd-electronic-lab-pt_PT.ks
index 823d72c..7c6e559 100644
--- a/fedora-livecd-electronic-lab-pt_PT.ks
+++ b/fedora-livecd-electronic-lab-pt_PT.ks
@@ -11,4 +11,7 @@ timezone Europe/Lisbon
 
 %packages
 @portuguese-support
+# exclude input methods
+-m17n*
+-scim*
 %end
diff --git a/fedora-livecd-kde-de_CH.ks b/fedora-livecd-kde-de_CH.ks
index 10f30b0..a12f689 100644
--- a/fedora-livecd-kde-de_CH.ks
+++ b/fedora-livecd-kde-de_CH.ks
@@ -11,7 +11,9 @@ timezone Europe/Zurich
 
 %packages
 @german-support
-
+# exclude input methods
+-m17n*
+-scim*
 %end
 
 %post
diff --git a/fedora-livecd-kde-de_DE.ks b/fedora-livecd-kde-de_DE.ks
index 6af425d..8b5d5b2 100644
--- a/fedora-livecd-kde-de_DE.ks
+++ b/fedora-livecd-kde-de_DE.ks
@@ -11,16 +11,14 @@ timezone Europe/Berlin
 
 %packages
 @german-support
+# exclude input methods
+-m17n*
+-scim*
 
 # don't use kpackagekit until it's translated
 -kpackagekit
 gnome-packagekit
 
-# don't install unnecessary input methods
--scim*
--m17n*
--iok
-
 # don't install unnecessary fonts
 -abyssinica-fonts
 -cjkunifonts-uming
diff --git a/fedora-livecd-kde-nl_NL.ks b/fedora-livecd-kde-nl_NL.ks
index 68e57f8..8c2e45a 100644
--- a/fedora-livecd-kde-nl_NL.ks
+++ b/fedora-livecd-kde-nl_NL.ks
@@ -11,4 +11,7 @@ timezone Europe/Amsterdam
 
 %packages
 @dutch-support
+# exclude input methods
+-m17n*
+-scim*
 %end
diff --git a/fedora-livecd-kde-pt_PT.ks b/fedora-livecd-kde-pt_PT.ks
index 85b886a..051dc0a 100644
--- a/fedora-livecd-kde-pt_PT.ks
+++ b/fedora-livecd-kde-pt_PT.ks
@@ -11,4 +11,7 @@ timezone Europe/Lisbon
 
 %packages
 @portuguese-support
+# exclude input methods
+-m17n*
+-scim*
 %end
diff --git a/fedora-livecd-xfce-de_CH.ks b/fedora-livecd-xfce-de_CH.ks
index 9f2ece4..40664f6 100644
--- a/fedora-livecd-xfce-de_CH.ks
+++ b/fedora-livecd-xfce-de_CH.ks
@@ -11,4 +11,7 @@ timezone Europe/Zurich
 
 %packages
 @german-support
+# exclude input methods
+-m17n*
+-scim*
 %end
diff --git a/fedora-livecd-xfce-nl_NL.ks b/fedora-livecd-xfce-nl_NL.ks
index ec9a92f..8add0ce 100644
--- a/fedora-livecd-xfce-nl_NL.ks
+++ b/fedora-livecd-xfce-nl_NL.ks
@@ -11,4 +11,7 @@ timezone Europe/Amsterdam
 
 %packages
 @dutch-support
+# exclude input methods
+-m17n*
+-scim*
 %end
diff --git a/fedora-livecd-xfce-pt_PT.ks b/fedora-livecd-xfce-pt_PT.ks
index ed65785..0023325 100644
--- a/fedora-livecd-xfce-pt_PT.ks
+++ b/fedora-livecd-xfce-pt_PT.ks
@@ -11,4 +11,7 @@ timezone Europe/Lisbon
 
 %packages
 @portuguese-support
+# exclude input methods
+-m17n*
+-scim*
 %end
diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks
index 693eb21..b5ab3ce 100644
--- a/fedora-livecd-xfce.ks
+++ b/fedora-livecd-xfce.ks
@@ -113,12 +113,8 @@ xfwm4-themes
 # dictionaries are big
 #-aspell-*
 #-man-pages-*
-#-scim-tables-*
 
 # more fun with space saving
-#-scim-lang-chinese
-#scim-chewing
-#scim-pinyin
 -gimp-help
 
 
diff --git a/fedora-livedvd-developer-de_CH.ks b/fedora-livedvd-developer-de_CH.ks
index 573a80b..10e35ca 100644
--- a/fedora-livedvd-developer-de_CH.ks
+++ b/fedora-livedvd-developer-de_CH.ks
@@ -11,6 +11,9 @@ timezone Europe/Zurich
 
 %packages
 @german-support
+# exclude input methods
+-m17n*
+-scim*
 %end
 
 %post
diff --git a/fedora-livedvd-developer-nl_NL.ks b/fedora-livedvd-developer-nl_NL.ks
index cd91c26..7dcc1f3 100644
--- a/fedora-livedvd-developer-nl_NL.ks
+++ b/fedora-livedvd-developer-nl_NL.ks
@@ -11,4 +11,7 @@ timezone Europe/Amsterdam
 
 %packages
 @dutch-support
+# exclude input methods
+-m17n*
+-scim*
 %end
diff --git a/fedora-livedvd-developer-pt_PT.ks b/fedora-livedvd-developer-pt_PT.ks
index ed8fcbc..59340d7 100644
--- a/fedora-livedvd-developer-pt_PT.ks
+++ b/fedora-livedvd-developer-pt_PT.ks
@@ -11,4 +11,7 @@ timezone Europe/Lisbon
 
 %packages
 @portuguese-support
+# exclude input methods
+-m17n*
+-scim*
 %end
diff --git a/fedora-livedvd-games-de_CH.ks b/fedora-livedvd-games-de_CH.ks
index 68579b9..e0af665 100644
--- a/fedora-livedvd-games-de_CH.ks
+++ b/fedora-livedvd-games-de_CH.ks
@@ -11,4 +11,7 @@ timezone Europe/Zurich
 
 %packages
 @german-support
+# exclude input methods
+-m17n*
+-scim*
 %end
diff --git a/fedora-livedvd-games-nl_NL.ks b/fedora-livedvd-games-nl_NL.ks
index 258a5da..fb124be 100644
--- a/fedora-livedvd-games-nl_NL.ks
+++ b/fedora-livedvd-games-nl_NL.ks
@@ -11,4 +11,7 @@ timezone Europe/Amsterdam
 
 %packages
 @dutch-support
+# exclude input methods
+-m17n*
+-scim*
 %end
diff --git a/fedora-livedvd-games-pt_PT.ks b/fedora-livedvd-games-pt_PT.ks
index 835a86c..f860084 100644
--- a/fedora-livedvd-games-pt_PT.ks
+++ b/fedora-livedvd-games-pt_PT.ks
@@ -11,4 +11,7 @@ timezone Europe/Lisbon
 
 %packages
 @portuguese-support
+# exclude input methods
+-m17n*
+-scim*
 %end