fedora-livecd-broffice.org.ks | 17 +++++------------
fedora-livecd-desktop-pt_BR.ks | 2 ++
2 files changed, 7 insertions(+), 12 deletions(-)
New commits:
commit 7c5f5275b2d6e4345a516ab53738ef3f047e894b
Merge: adb4a41... 20f6c71...
Author: Igor Pires Soares <igor(a)amd5600.(none)>
Date: Sun Aug 31 15:22:43 2008 -0300
Merge branch 'master' of
git://git.fedorahosted.org/spin-kickstarts
commit adb4a410d6bb5e553309ba3598f8a4117910d644
Author: Igor Pires Soares <igor(a)amd5600.(none)>
Date: Sun Aug 31 12:43:38 2008 -0300
Remove spin debranding, put codeina back
diff --git a/fedora-livecd-broffice.org.ks b/fedora-livecd-broffice.org.ks
index ea13625..42b284b 100644
--- a/fedora-livecd-broffice.org.ks
+++ b/fedora-livecd-broffice.org.ks
@@ -36,15 +36,12 @@ broffice.org-draw
-baekmuk-*
-cjkunifonts-*
-VLGothic-fonts
--dejavu-fonts-experimental
# Saving space in order to get
BrOffice.org in
-gnome-utils
--planner
--aspell-*
--codeina
-gnome-games-*
+-planner
-scim-python*
-scim-chewing
-scim-pinyin
@@ -54,15 +51,14 @@ broffice.org-draw
-evince-djvu
-ekiga
-f-spot
-
-
-# Debranding the spin
--fedora-logos
-generic-logos
+-cheese
+-sound-juicer
%end
+
%post
+
# system-config-keyboard doesn't really work (missing xorg.conf etc)
cat >>/etc/X11/xorg.conf << EOF
Section "InputDevice"
@@ -72,7 +68,4 @@ Section "InputDevice"
EndSection
EOF
-# Needed for spin debranding
-sed -i -e 's/Fedora/Generic/g' /etc/fedora-release
-
%end
commit dd1430bdc1e3a7388aa49a2d61c159020b3c0f50
Author: Igor Pires Soares <igor(a)amd5600.(none)>
Date: Sun Aug 31 12:23:45 2008 -0300
Include missing %include
diff --git a/fedora-livecd-desktop-pt_BR.ks b/fedora-livecd-desktop-pt_BR.ks
index 15fbfef..6b77e5e 100644
--- a/fedora-livecd-desktop-pt_BR.ks
+++ b/fedora-livecd-desktop-pt_BR.ks
@@ -3,6 +3,8 @@
# Maintainer(s):
# - Igor Pires Soares <igor at projetofedora.org>
+%include fedora-livecd-desktop.ks
+
lang pt_BR.UTF-8
keyboard br-abnt2
timezone America/Sao_Paulo