RHEL/Fedora: better integration with distribution, small fixes

3 files changed, 257 insertions, 0 deletions

diff --git a/redhat/trinity-live/fedora-live-tde-base.ks b/redhat/trinity-live/fedora-live-tde-base.ks
new file mode 100644
index 000000000..b56e5c92a
--- /dev/null
+++ b/redhat/trinity-live/fedora-live-tde-base.ks
@@ -0,0 +1,94 @@
+# Copied from 'fedora-live-kde-base.ks'
+
+%include fedora-live-base.ks
+repo --name=trinity --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-3.5.13/RPMS/$basearch
+repo --name=trinity-noarch --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-3.5.13/RPMS/noarch
+repo --name=trinity-extras --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-extras/RPMS/$basearch
+repo --name=trinity-extras-noarch --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-extras/RPMS/noarch
+
+%packages
+
+### The KDE-Desktop
+
+trinity-desktop
+
+
+### fixes
+
+# make sure alsaunmute is there
+alsa-utils
+
+# make sure gnome-packagekit doesn't end up the KDE live images
+-gnome-packagekit*
+
+%end
+
+
+%post
+
+# create /etc/sysconfig/desktop (needed for installation)
+cat > /etc/sysconfig/desktop <<EOF
+DESKTOP="KDE"
+DISPLAYMANAGER="/opt/trinity/bin/kdm"
+EOF
+
+# make oxygen-gtk the default GTK+ 2 theme for root (see #683855, #689070)
+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
+
+# add initscript
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
+    # use image also for kdm
+    mkdir -p /usr/share/apps/kdm/faces
+    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
+fi
+
+# make liveuser use KDE
+echo "/opt/trinity/bin/startkde" > /home/liveuser/.xsession
+chmod a+x /home/liveuser/.xsession
+chown liveuser:liveuser /home/liveuser/.xsession
+
+# set up autologin for user liveuser
+sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /opt/trinity/share/config/kdm/kdmrc
+sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /opt/trinity/share/config/kdm/kdmrc
+
+# set up user liveuser as default user and preselected user
+sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /opt/trinity/share/config/kdm/kdmrc
+sed -i 's/#DefaultUser=johndoe/DefaultUser=liveuser/' /opt/trinity/share/config/kdm/kdmrc
+
+# add liveinst.desktop to favorites menu
+mkdir -p /home/liveuser/.trinity/share/config/
+
+# show liveinst.desktop on desktop and in menu
+sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+
+# chmod +x ~/Desktop/liveinst.desktop to disable KDE's security warning
+chmod +x /usr/share/applications/liveinst.desktop
+
+# copy over the icons for liveinst to hicolor
+cp /usr/share/icons/gnome/16x16/apps/system-software-install.png /usr/share/icons/hicolor/16x16/apps/
+cp /usr/share/icons/gnome/22x22/apps/system-software-install.png /usr/share/icons/hicolor/22x22/apps/
+cp /usr/share/icons/gnome/24x24/apps/system-software-install.png /usr/share/icons/hicolor/24x24/apps/
+cp /usr/share/icons/gnome/32x32/apps/system-software-install.png /usr/share/icons/hicolor/32x32/apps/
+cp /usr/share/icons/gnome/48x48/apps/system-software-install.png /usr/share/icons/hicolor/48x48/apps/
+cp /usr/share/icons/gnome/256x256/apps/system-software-install.png /usr/share/icons/hicolor/256x256/apps/
+touch /usr/share/icons/hicolor/
+
+# Create user Desktop directory
+mkdir -p /home/liveuser/Desktop
+
+# make sure to set the right permissions and selinux contexts
+chown -R liveuser:liveuser /home/liveuser/
+restorecon -R /home/liveuser/
+
+# don't use prelink on a running KDE live image
+sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink
+
+EOF
+
+%end
diff --git a/redhat/trinity-live/fedora-livecd-tde.ks b/redhat/trinity-live/fedora-livecd-tde.ks
new file mode 100644
index 000000000..16c799d1f
--- /dev/null
+++ b/redhat/trinity-live/fedora-livecd-tde.ks
@@ -0,0 +1,79 @@
+# fedora-livecd-tde.ks
+#
+# Description:
+# - Fedora Livecd Spin with the Trinity Desktop Environment (TDE)
+# - Based on 'fedora-livecd-kde.ks' provided by Fedora 15
+#
+# Maintainer(s):
+# - Francois Andriot <francois.andriot@free.fr>
+
+%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
+trinity-live-openbox
+
+# Some TDE applications
+trinity-amarok
+trinity-digikam
+trinity-dolphin
+trinity-gwenview
+trinity-k3b
+trinity-kaffeine
+trinity-kbookreader
+trinity-konversation
+trinity-ksensors
+trinity-kstreamripper
+trinity-yakuake
+
+# Some TDE translations
+trinity-kde-i18n-French
+trinity-kde-i18n-German
+#trinity-kde-i18n-Spanish
+trinity-kde-i18n-Chinese-Big5
+
+# Fedora stuff
+fuse
+liveusb-creator
+
+
+### more desktop stuff
+fedora-icon-theme
+adwaita-cursor-theme
+adwaita-gtk2-theme
+adwaita-gtk3-theme
+
+# use yum-presto by default
+yum-presto
+
+### space issues
+
+# fonts (we make no bones about admitting we're english-only)
+wqy-microhei-fonts	# a compact CJK font, to replace:
+-un-core-dotum-fonts	# Korean
+-vlgothic-fonts		# Japanese
+-wqy-zenhei-fonts	# Chinese
+
+-paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
+#-stix-fonts		# mathematical symbols
+
+# remove input methods to free space
+-@input-methods
+-scim*
+-m17n*
+-ibus*
+-iok
+
+# save some space (from @base)
+-make
+-nss_db
+
+## avoid serious bugs by omitting broken stuff
+
+%end
+
+%post
+%end
diff --git a/redhat/trinity-live/trinity-live.spec b/redhat/trinity-live/trinity-live.spec
new file mode 100644
index 000000000..95733ae80
--- /dev/null
+++ b/redhat/trinity-live/trinity-live.spec
@@ -0,0 +1,84 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.13
+%endif
+%define release 1
+
+%define _datadir %{_usr}/share
+
+Name:		trinity-live
+Version:	%{version}
+Release:	%{?release}%{?dist}
+License:	GPL
+Summary:	Trinity Spins
+Group:		Applications/System
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
+
+Requires:	fedora-kickstarts
+Requires:	livecd-tools
+
+Source0:	fedora-live-tde-base.ks
+Source1:	fedora-livecd-tde.ks
+
+%description
+This package contains the Trinity configuration file to build a Fedora
+LiveCD containing Fedora.
+
+%package openbox
+Summary:	bootstrap 'openbox' script that runs TDE's kwin
+Requires:	trinity-kdebase
+BuildArch:	noarch
+Group:		Applications/System
+
+%description openbox
+There is a bug in 'firstboot' that prevents it to invoke 'openbox' correctly.
+The provided script redirects 'openbox' to 'kwin'.
+It is used on the Fedora TDE LiveCD.
+
+%prep
+
+%build
+cat <<EOF >openbox
+#!/bin/sh
+
+# This script is used by 'firstboot' only.
+# It allows to run TDE's kwin instead of openbox.
+
+export PATH=%{_bindir}:\${PATH}
+export HOME=/root
+rm -rf \${HOME}/.DCOPserver*
+
+rpm -e trinity-live-openbox
+
+exec kwin \$@
+EOF
+
+%install
+%__rm -rf %{?buildroot}
+%__mkdir_p %{?buildroot}%{_datadir}/spin-kickstarts
+%__install -m 644 %{SOURCE0} %{?buildroot}%{_datadir}/spin-kickstarts
+%__install -m 644 %{SOURCE1} %{?buildroot}%{_datadir}/spin-kickstarts
+
+# Openbox
+%__mkdir_p "%{?buildroot}/usr/local/bin"
+%__install -m 755 openbox "%{?buildroot}/usr/local/bin"
+
+
+%files
+%{_datadir}/spin-kickstarts/fedora-live-tde-base.ks
+%{_datadir}/spin-kickstarts/fedora-livecd-tde.ks
+
+%files openbox
+/usr/local/bin/openbox
+
+
+%changelog
+* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
+- Initial build