summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-02-18 11:45:10 +0100
committerFrancois Andriot <francois.andriot@free.fr>2012-02-18 11:45:10 +0100
commit279af91bd102f7416c1b74f16c715b3bc0f65b2b (patch)
tree1c499027a354a38bea9028120924cc4cba641f92
parent8f318b4997fb748b7c42928b246f973544fb13ea (diff)
downloadtde-packaging-279af91bd102f7416c1b74f16c715b3bc0f65b2b.tar.gz
tde-packaging-279af91bd102f7416c1b74f16c715b3bc0f65b2b.zip
[RHEL/Fedora] Updates TDE LiveCD
-rw-r--r--redhat/extras/trinity-live/fedora-live-tde-base.ks10
-rw-r--r--redhat/extras/trinity-live/fedora-livecd-tde.ks4
-rw-r--r--redhat/extras/trinity-live/trinity-live.spec6
3 files changed, 16 insertions, 4 deletions
diff --git a/redhat/extras/trinity-live/fedora-live-tde-base.ks b/redhat/extras/trinity-live/fedora-live-tde-base.ks
index 827a0b2bf..593b44ca1 100644
--- a/redhat/extras/trinity-live/fedora-live-tde-base.ks
+++ b/redhat/extras/trinity-live/fedora-live-tde-base.ks
@@ -86,6 +86,14 @@ touch /usr/share/icons/hicolor/
mkdir -p /home/liveuser/Desktop
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
+Autostart=true
+Visible=false
+EOF
+
# make sure to set the right permissions and selinux contexts
chown -R liveuser:liveuser /home/liveuser/
restorecon -R /home/liveuser/
@@ -97,7 +105,7 @@ EOF
### TDE LIVECD specific features ###
-# Sets 'nm-applet' to run automatically
+# Sets 'nm-applet' to run automatically (system-wide)
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 efc379f6a..b9e0f78f1 100644
--- a/redhat/extras/trinity-live/fedora-livecd-tde.ks
+++ b/redhat/extras/trinity-live/fedora-livecd-tde.ks
@@ -25,6 +25,7 @@ trinity-k3b
trinity-kaffeine
trinity-kasablanca
trinity-kbookreader
+trinity-kdebluetooth
trinity-kde-style-lipstik
trinity-kgtk-qt3
trinity-kio-umountwrapper
@@ -43,11 +44,10 @@ trinity-kde-i18n-French
#trinity-kde-i18n-Spanish
trinity-kde-i18n-Chinese-Big5
-
# Fedora stuff
fuse
liveusb-creator
-
+yumex
### more desktop stuff
fedora-icon-theme
diff --git a/redhat/extras/trinity-live/trinity-live.spec b/redhat/extras/trinity-live/trinity-live.spec
index 89f09e7f9..52c7612ad 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 2
+%define release 3
%define _datadir %{_usr}/share
@@ -79,6 +79,10 @@ EOF
%changelog
+* Sat Jan 07 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Start kmix automatically in LiveCD
+- Add 'yumex' package manager
+
* 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