Fedora: updates trinity-live to build Fedora 17 LiveCD

3 files changed, 34 insertions, 27 deletions

diff --git a/redhat/extras/trinity-live/fedora-live-tde-base.ks b/redhat/extras/trinity-live/fedora-live-tde-base.ks
index 593b44ca1..c54b149d2 100644
--- a/redhat/extras/trinity-live/fedora-live-tde-base.ks
+++ b/redhat/extras/trinity-live/fedora-live-tde-base.ks
@@ -8,7 +8,8 @@ repo --name=trinity-extras-noarch --baseurl=http://trinity.mangafrance.com/f$rel
 
 %packages
 
-### The KDE-Desktop
+### The Trinity Desktop
+
 trinity-desktop
 hal
 
@@ -35,12 +36,17 @@ DESKTOP="KDE"
 DISPLAYMANAGER="/opt/trinity/bin/kdm"
 EOF
 
-# make oxygen-gtk the default GTK+ 2 theme for root (see #683855, #689070)
+# make oxygen-gtk the default GTK+ theme for root (see #683855, #689070, #808062)
 cat > /root/.gtkrc-2.0 << EOF
 include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
 include "/etc/gtk-2.0/gtkrc"
 gtk-theme-name="oxygen-gtk"
 EOF
+mkdir -p /root/.config/gtk-3.0
+cat > /root/.config/gtk-3.0/settings.ini << EOF
+[Settings]
+gtk-theme-name = oxygen-gtk
+EOF
 
 # add initscript
 cat >> /etc/rc.d/init.d/livesys << EOF
@@ -66,6 +72,10 @@ sed -i 's/#DefaultUser=johndoe/DefaultUser=liveuser/' /opt/trinity/share/config/
 
 # add liveinst.desktop to favorites menu
 mkdir -p /home/liveuser/.trinity/share/config/
+cat > /home/liveuser/.trinity/share/config/kickoffrc << MENU_EOF
+[Favorites]
+FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop
+MENU_EOF
 
 # show liveinst.desktop on desktop and in menu
 sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
@@ -89,10 +99,10 @@ mkdir -p /home/liveuser/Documents
 # Kmix (from TDE) should be started automatically
 #mkdir -p /home/liveuser/.trinity/Autostart
 #ln -sf /opt/trinity/share/applications/kde/kmix.desktop /home/liveuser/.trinity/Autostart/kmix.desktop
-cat <<EOF >/home/liveuser/.trinity/share/config/kmixrc
+cat <<KMIX_EOF >/home/liveuser/.trinity/share/config/kmixrc
 Autostart=true
 Visible=false
-EOF
+KMIX_EOF
 
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
diff --git a/redhat/extras/trinity-live/fedora-livecd-tde.ks b/redhat/extras/trinity-live/fedora-livecd-tde.ks
index b9e0f78f1..6c926a25a 100644
--- a/redhat/extras/trinity-live/fedora-livecd-tde.ks
+++ b/redhat/extras/trinity-live/fedora-livecd-tde.ks
@@ -10,6 +10,7 @@
 %include fedora-live-tde-base.ks
 %include fedora-live-minimization.ks
 
+
 %packages
 # Additional packages that are not default in trinity-desktop but useful
 trinity-desktop-extras
@@ -19,15 +20,15 @@ trinity-live-openbox
 trinity-amarok
 trinity-digikam
 trinity-dolphin
-trinity-gtk-qt-engine
+#trinity-gtk-qt-engine
 trinity-gwenview
 trinity-k3b
 trinity-kaffeine
 trinity-kasablanca
 trinity-kbookreader
 trinity-kdebluetooth
-trinity-kde-style-lipstik
-trinity-kgtk-qt3
+trinity-style-lipstik
+#trinity-kgtk-qt3
 trinity-kio-umountwrapper
 trinity-kwin-style-crystal
 #trinity-knetworkmanager
@@ -35,26 +36,20 @@ trinity-konversation
 trinity-kpowersave
 trinity-ksensors
 trinity-kstreamripper
-trinity-smb4k
+#trinity-smb4k
 trinity-yakuake
 
 # Some TDE translations
-trinity-kde-i18n-French
+#trinity-kde-i18n-French
 #trinity-kde-i18n-German
 #trinity-kde-i18n-Spanish
-trinity-kde-i18n-Chinese-Big5
+#trinity-kde-i18n-Chinese-Big5
 
 # Fedora stuff
 fuse
 liveusb-creator
 yumex
 
-### more desktop stuff
-fedora-icon-theme
-adwaita-cursor-theme
-adwaita-gtk2-theme
-adwaita-gtk3-theme
-
 # use yum-presto by default
 yum-presto
 
@@ -62,9 +57,11 @@ yum-presto
 
 # fonts (we make no bones about admitting we're english-only)
 wqy-microhei-fonts	# a compact CJK font, to replace:
+-nhn-nanum-gothic-fonts	# Korean
 -un-core-dotum-fonts	# Korean
 -vlgothic-fonts		# Japanese
--wqy-zenhei-fonts	# Chinese
+-wqy-zenhei-fonts	# simplified Chinese
+-cjkuni-uming-fonts	# traditional Chinese
 
 -paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
 #-stix-fonts		# mathematical symbols
@@ -80,6 +77,9 @@ wqy-microhei-fonts	# a compact CJK font, to replace:
 -make
 -nss_db
 
+# save space (it pulls in gdisk/udisks2/libicu)
+-gnome-disk-utility
+
 ## avoid serious bugs by omitting broken stuff
 
 %end
diff --git a/redhat/extras/trinity-live/trinity-live.spec b/redhat/extras/trinity-live/trinity-live.spec
index 52c7612ad..6588028da 100644
--- a/redhat/extras/trinity-live/trinity-live.spec
+++ b/redhat/extras/trinity-live/trinity-live.spec
@@ -1,14 +1,8 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.13
-%endif
-%define release 3
-
-%define _datadir %{_usr}/share
+%define _prefix /usr
 
 Name:		trinity-live
-Version:	%{version}
-Release:	%{?release}%{?dist}
+Version:	3.5.13
+Release:	4%{?dist}
 License:	GPL
 Summary:	Trinity Spins
 Group:		Applications/System
@@ -33,7 +27,7 @@ LiveCD containing Fedora.
 
 %package openbox
 Summary:	bootstrap 'openbox' script that runs TDE's kwin
-Requires:	trinity-kdebase
+Requires:	trinity-twin
 BuildArch:	noarch
 Group:		Applications/System
 
@@ -79,6 +73,9 @@ EOF
 
 
 %changelog
+* Wed Jul 11 2012 Francois Andriot <[email protected]> - 3.5.13-4
+- Updates with new split packages
+
 * Sat Jan 07 2012 Francois Andriot <[email protected]> - 3.5.13-3
 - Start kmix automatically in LiveCD
 - Add 'yumex' package manager