Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

3 files changed, 21 insertions, 28 deletions

diff --git a/redhat/extras/trinity-live/fedora-live-tde-base.ks b/redhat/extras/trinity-live/fedora-live-tde-base.ks
index ed912dfff..827a0b2bf 100644
--- a/redhat/extras/trinity-live/fedora-live-tde-base.ks
+++ b/redhat/extras/trinity-live/fedora-live-tde-base.ks
@@ -51,7 +51,7 @@ if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
     cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
 fi
 
-# make liveuser use KDE
+# make liveuser use TDE
 echo "/opt/trinity/bin/startkde" > /home/liveuser/.xsession
 chmod a+x /home/liveuser/.xsession
 chown liveuser:liveuser /home/liveuser/.xsession
@@ -95,19 +95,9 @@ sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink
 
 EOF
 
+### TDE LIVECD specific features ###
+
 # Sets 'nm-applet' to run automatically
-mkdir -p /home/liveuser/.trinity/Autostart
-cat <<EOF >/home/liveuser/.trinity/Autostart/nm-applet
-#!/bin/sh
-
-# Waits until kicker is started, so that
-# nm-applet can dock correctly.
-while ! pidof kicker; do
-	sleep 1
-done
-sleep 3
-/usr/bin/nm-applet
-EOF
-chmod +x /home/liveuser/.trinity/Autostart/nm-applet
+ln -sf /usr/share/applications/nm-applet.desktop /opt/trinity/share/autostart/nm-applet.desktop
 
 %end
diff --git a/redhat/extras/trinity-live/fedora-livecd-tde.ks b/redhat/extras/trinity-live/fedora-livecd-tde.ks
index 88ab2f91a..efc379f6a 100644
--- a/redhat/extras/trinity-live/fedora-livecd-tde.ks
+++ b/redhat/extras/trinity-live/fedora-livecd-tde.ks
@@ -10,10 +10,6 @@
 %include fedora-live-tde-base.ks
 %include fedora-live-minimization.ks
 
-# 3rd party for VLC
-#repo --name=atrpms --baseurl=http://dl.atrpms.net/f$releasever-$basearch/atrpms/stable
-
-
 %packages
 # Additional packages that are not default in trinity-desktop but useful
 trinity-desktop-extras
@@ -21,33 +17,36 @@ trinity-live-openbox
 
 # Some TDE applications
 trinity-amarok
-#trinity-digikam
+trinity-digikam
 trinity-dolphin
+trinity-gtk-qt-engine
 trinity-gwenview
 trinity-k3b
 trinity-kaffeine
+trinity-kasablanca
 trinity-kbookreader
+trinity-kde-style-lipstik
+trinity-kgtk-qt3
+trinity-kio-umountwrapper
+trinity-kwin-style-crystal
 #trinity-knetworkmanager
 trinity-konversation
+trinity-kpowersave
 trinity-ksensors
 trinity-kstreamripper
+trinity-smb4k
 trinity-yakuake
 
 # Some TDE translations
 trinity-kde-i18n-French
 #trinity-kde-i18n-German
-trinity-kde-i18n-Spanish
+#trinity-kde-i18n-Spanish
 trinity-kde-i18n-Chinese-Big5
 
-# 3rd party stuff
-#vlc
 
 # Fedora stuff
 fuse
 liveusb-creator
-#wlassistant
-#wicd
-#wicd-gtk
 
 
 ### more desktop stuff
diff --git a/redhat/extras/trinity-live/trinity-live.spec b/redhat/extras/trinity-live/trinity-live.spec
index 95733ae80..89f09e7f9 100644
--- a/redhat/extras/trinity-live/trinity-live.spec
+++ b/redhat/extras/trinity-live/trinity-live.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 1
+%define release 2
 
 %define _datadir %{_usr}/share
 
@@ -67,8 +67,7 @@ EOF
 %__install -m 644 %{SOURCE1} %{?buildroot}%{_datadir}/spin-kickstarts
 
 # Openbox
-%__mkdir_p "%{?buildroot}/usr/local/bin"
-%__install -m 755 openbox "%{?buildroot}/usr/local/bin"
+%__install -D -m 755 openbox "%{?buildroot}/usr/local/bin/openbox"
 
 
 %files
@@ -80,5 +79,10 @@ EOF
 
 
 %changelog
+* Mon Dec 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- More TDE 3.5.13 specific visual settings
+- Updates all packages to fix TDE bugs
+- Add more applications
+
 * Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
 - Initial build