From c72b76a46361164fa731cceeadd94220e1a573bf Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 26 Nov 2011 10:14:14 +0100 Subject: Move Fedora/RHEL specific components to extra subdir --- .../trinity-desktop/trinity-3.5.13-fedora.repo | 36 ++++++ .../trinity-desktop/trinity-3.5.13-rhel.repo | 36 ++++++ redhat/extras/trinity-desktop/trinity-desktop.spec | 127 +++++++++++++++++++++ redhat/extras/trinity-live/fedora-live-tde-base.ks | 113 ++++++++++++++++++ redhat/extras/trinity-live/fedora-livecd-tde.ks | 89 +++++++++++++++ redhat/extras/trinity-live/trinity-live.spec | 84 ++++++++++++++ 6 files changed, 485 insertions(+) create mode 100644 redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo create mode 100644 redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo create mode 100644 redhat/extras/trinity-desktop/trinity-desktop.spec create mode 100644 redhat/extras/trinity-live/fedora-live-tde-base.ks create mode 100644 redhat/extras/trinity-live/fedora-livecd-tde.ks create mode 100644 redhat/extras/trinity-live/trinity-live.spec (limited to 'redhat/extras') diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo new file mode 100644 index 000000000..e6ac33dad --- /dev/null +++ b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo @@ -0,0 +1,36 @@ +[trinity-3.5.13-fedora] +name=trinity-3.5.13-fedora +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch +enabled=1 +gpgcheck=0 + +[trinity-3.5.13-fedora-noarch] +name=trinity-3.5.13-fedora-noarch +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch +enabled=1 +gpgcheck=0 + +[trinity-3.5.13-fedora-source] +name=trinity-3.5.13-fedora-source +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS +enabled=1 +gpgcheck=0 + +[trinity-extras-fedora] +name=trinity-extras-fedora +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/RPMS/$basearch +enabled=1 +gpgcheck=0 + +[trinity-extras-fedora-noarch] +name=trinity-extras-fedora-noarch +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/RPMS/noarch +enabled=1 +gpgcheck=0 + +[trinity-extras-fedora-source] +name=trinity-extras-fedora-source +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/SRPMS +enabled=1 +gpgcheck=0 + diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo new file mode 100644 index 000000000..e54847b54 --- /dev/null +++ b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo @@ -0,0 +1,36 @@ +[trinity-3.5.13-rhel] +name=trinity-3.5.13-rhel +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch +enabled=1 +gpgcheck=0 + +[trinity-3.5.13-rhel-noarch] +name=trinity-3.5.13-rhel-noarch +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch +enabled=1 +gpgcheck=0 + +[trinity-3.5.13-rhel-source] +name=trinity-3.5.13-f16-source +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS +enabled=1 +gpgcheck=0 + +[trinity-extras-rhel] +name=trinity-extras-rhel +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/RPMS/$basearch +enabled=1 +gpgcheck=0 + +[trinity-extras-rhel-noarch] +name=trinity-extras-rhel-noarch +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/RPMS/noarch +enabled=1 +gpgcheck=0 + +[trinity-extras-rhel-source] +name=trinity-extras-rhel-source +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/SRPMS +enabled=1 +gpgcheck=0 + diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec new file mode 100644 index 000000000..1820928c9 --- /dev/null +++ b/redhat/extras/trinity-desktop/trinity-desktop.spec @@ -0,0 +1,127 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 2 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +Name: trinity-desktop +Version: %{version} +Release: %{?release}%{?dist}%{?_variant} +License: GPL +Summary: Meta-package to install TDE +Group: User Interface/Desktops + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + +Source0: trinity-3.5.13-fedora.repo +Source1: trinity-3.5.13-rhel.repo + +Requires: trinity-kdeaccessibility >= %{version} +Requires: trinity-kdeaddons >= %{version} +Requires: trinity-kdeadmin >= %{version} +Requires: trinity-kdeartwork >= %{version} +Requires: trinity-kdeartwork-icons >= %{version} +Requires: trinity-kdebase >= %{version} +Requires: trinity-kdebindings >= %{version} +Requires: trinity-kdeedu >= %{version} +Requires: trinity-kdegames >= %{version} +Requires: trinity-kdegraphics >= %{version} +Requires: trinity-kdemultimedia >= %{version} +Requires: trinity-kdenetwork >= %{version} +Requires: trinity-kdepim >= %{version} +Requires: trinity-kdeutils >= %{version} +Requires: trinity-kdetoys >= %{version} +Requires: trinity-repo >= %{version} +Requires: hal + +%description +The TDE project aims to keep the KDE3.5 computing style alive, as well as +polish off any rough edges that were present as of KDE 3.5.10. Along +the way, new useful features will be added to keep the environment +up-to-date. +Toward that end, significant new enhancements have already been made in +areas such as display control, network connectivity, user +authentication, and much more! + +%package dev +Group: User Interface/Desktops +Summary: Meta-package to install TDE development tools + +Requires: trinity-kdesdk >= %{version} +Requires: trinity-kdevelop >= %{version} +Requires: trinity-kdewebdev >= %{version} + +%description dev +%{summary} + +%package extras +Group: User Interface/Desktops +Summary: Meta-package to install extra TDE packages + +Requires: trinity-kdeaddons-extras >= %{version} +Requires: trinity-kdebase-extras >= %{version} +Requires: trinity-kdegraphics-extras >= %{version} +Requires: trinity-kdemultimedia-extras >= %{version} +Requires: trinity-kdenetwork-extras >= %{version} +Requires: trinity-kdeutils-extras >= %{version} + +%description extras +%{summary} + +%package all +Group: User Interface/Desktops +Summary: Meta-package to install all TDE packages + +Requires: %{name} == %{version} +Requires: %{name}-dev == %{version} +Requires: %{name}-extras == %{version} + +%description all +%{summary} + +%package -n trinity-repo +Group: User Interface/Desktops +Summary: Yum configuration files for Trinity + +%description -n trinity-repo +%{summary} + +%prep + +%build + +%install +%__rm -rf %{?buildroot} +%__mkdir_p %{?buildroot}%{_sysconfdir}/yum.repos.d +%if 0%{?fedora} +%__install -m 644 %{SOURCE0} %{?buildroot}%{_sysconfdir}/yum.repos.d +%else +%__install -m 644 %{SOURCE1} %{?buildroot}%{_sysconfdir}/yum.repos.d +%endif + +%files + +%files dev + +%files extras + +%files all + +%files -n trinity-repo +%{_sysconfdir}/yum.repos.d/*.repo + +%changelog +* Sat Nov 12 2011 Francois Andriot - 3.5.13-2 +- Add 'repo' package diff --git a/redhat/extras/trinity-live/fedora-live-tde-base.ks b/redhat/extras/trinity-live/fedora-live-tde-base.ks new file mode 100644 index 000000000..ed912dfff --- /dev/null +++ b/redhat/extras/trinity-live/fedora-live-tde-base.ks @@ -0,0 +1,113 @@ +# 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 +hal + +# TDE is missing a Network Applet, so we use Gnome... +NetworkManager-gnome + + +### 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 < /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 +mkdir -p /home/liveuser/Documents + +# 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 + +# Sets 'nm-applet' to run automatically +mkdir -p /home/liveuser/.trinity/Autostart +cat </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 + +%end diff --git a/redhat/extras/trinity-live/fedora-livecd-tde.ks b/redhat/extras/trinity-live/fedora-livecd-tde.ks new file mode 100644 index 000000000..88ab2f91a --- /dev/null +++ b/redhat/extras/trinity-live/fedora-livecd-tde.ks @@ -0,0 +1,89 @@ +# 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 + +%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 +trinity-live-openbox + +# Some TDE applications +trinity-amarok +#trinity-digikam +trinity-dolphin +trinity-gwenview +trinity-k3b +trinity-kaffeine +trinity-kbookreader +#trinity-knetworkmanager +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 + +# 3rd party stuff +#vlc + +# Fedora stuff +fuse +liveusb-creator +#wlassistant +#wicd +#wicd-gtk + + +### 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/extras/trinity-live/trinity-live.spec b/redhat/extras/trinity-live/trinity-live.spec new file mode 100644 index 000000000..95733ae80 --- /dev/null +++ b/redhat/extras/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 +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 <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 - 3.5.13-1 +- Initial build -- cgit v1.2.3