RHEL/Fedora: better integration with distribution, small fixes

pull/3/head
albator 13 years ago
parent 21700c329b
commit ba0a15d74e

@ -106,6 +106,22 @@ cd build
%__rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%post devel
/sbin/ldconfig
%postun devel
/sbin/ldconfig
%files
%defattr(-,root,root,-)
%{_bindir}/knetworkmanager

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 2
%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -29,6 +29,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: arts-%{version}.tar.gz
# TDE 3.5.13: Re-enable lost OSS support
Patch0: arts-3.5.13-enable_oss.patch
BuildRequires: tqtinterface-devel
BuildRequires: audiofile-devel
BuildRequires: alsa-lib-devel
@ -70,6 +73,7 @@ Development files for %{name}
%prep
%setup -q -n dependencies/arts
%patch0 -p1
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 5
%define release 6
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -49,21 +49,45 @@ Source5: pamd.kscreensaver-trinity%{?dist}
# TDE for RHEL/Fedora specific patches
# [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
Patch3: kdebase-3.5.13-kdesu-noignorebutton.patch
# [kdebase/kdesktop] Modifies "open terminal here" on desktop
## [kdebase/kdesktop] Modifies "open terminal here" on desktop
Patch5: kdebase-3.5.12-desktop-openterminalhere.patch
# [kdebase/kioslave] Forces HAL backend to use HAL mount options
## [kdebase/kioslave] Forces HAL backend to use HAL mount options
Patch6: kdebase-3.5.12-halmountoptions.patch
# [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession'
## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession'
Patch7: kdebase-3.5.13-genkdmconf_Xsession_location.patch
# [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64
## [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64
Patch8: kdebase-3.5.13-startkde_ldpreload.patch
# [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes
## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes
Patch9: kdebase-3.5.13-mediamanager_ftbfs.patch
# [kdebase/kicker/kicker/ui]
## [kdebase/kicker/kicker/ui]
Patch10: kdebase-3.5.12-kickoff_unstable.patch
# Fedora 15 Theme: "Lovelock"
%if 0%{?fedora} == 15
Requires: lovelock-backgrounds-single
%define kde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
%endif
# Fedora 16 Theme: "Verne"
%if 0%{?fedora} == 16
Requires: verne-backgrounds-single
%define kde_bg /usr/share/backgrounds/verne/default/standard/verne.png
%endif
# RHEL 5 Theme
%if 0%{?rhel} == 5
Requires: desktop-backgrounds-basic
%define kde_bg /usr/share/backgrounds/images/default.jpg
%endif
# RHEL 6 Theme
%if 0%{?rhel} == 6
Requires: redhat-logos
%define kde_bg /usr/share/backgrounds/default.png
%endif
BuildRequires: tqtinterface-devel
BuildRequires: trinity-arts-devel
BuildRequires: trinity-kdelibs-devel
@ -192,6 +216,22 @@ Protocol handlers (KIOslaves) for personal information management, including:
%patch9 -p1
cd kicker/kicker
%patch10 -p0
cd -
# Applies an optional distro-specific graphical theme
%if "%{?kde_bg}" != ""
# KDM Background
%__sed -i "kdm/kfrontend/genkdmconf.c" \
-e 's,"Wallpaper=isadora.png\n","Wallpaper=%{kde_bg}\n",'
# TDE user default background
%__sed -i "kpersonalizer/keyecandypage.cpp" \
-e 's,#define DEFAULT_WALLPAPER "isadora.png",#define DEFAULT_WALLPAPER "%{kde_bg}",'
%__sed -i "startkde" \
-e 's,/usr/share/wallpapers/isadora.png.desktop,%{kde_bg},' \
-e 's,Wallpaper=isadora.png,Wallpaper=%{kde_bg},'
%endif
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@ -272,6 +312,10 @@ cd build
-e "s/^#*MinShowUID=.*/MinShowUID=500/"
%endif
# Moves the XDG configuration files to TDE directory
%__mkdir_p "%{?buildroot}%{_prefix}/etc"
%__mv -f "%{?buildroot}%{_sysconfdir}/xdg" "%{?buildroot}%{_prefix}/etc"
%clean
%__rm -rf %{?buildroot}
@ -474,14 +518,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/sounds/*
%{tde_libdir}/*
%{_libdir}/libkdeinit_*.*
%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
%if 0%{?fedora} >= 15 && "%{?_prefix}" != "/usr"
%exclude %{_sysconfdir}/xdg/menus/kde-information.menu
%else
%{_sysconfdir}/xdg/menus/kde-information.menu
%endif
%{_sysconfdir}/xdg/menus/kde-screensavers.menu
%{_sysconfdir}/xdg/menus/kde-settings.menu
%{_prefix}/etc/xdg/menus/applications-merged/kde-essential.menu
%{_prefix}/etc/xdg/menus/kde-information.menu
%{_prefix}/etc/xdg/menus/kde-screensavers.menu
%{_prefix}/etc/xdg/menus/kde-settings.menu
/usr/share/xsessions/*.desktop
# Remove conflicts with redhat-menus
%if "%{?_prefix}" != "/usr"
@ -539,6 +579,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/cmake/*.cmake
%changelog
* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
- Add graphical theme for RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
* Fri Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
- Add "service(graphical-login)"
- Add kickoff menu fix [TDE Bug #508]

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 1
%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"
@ -257,6 +257,11 @@ install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk
install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc
install -p -m 0755 -D %{SOURCE5} %{buildroot}%{_initrddir}/lisa
# RHEL 5: Avoids conflict with 'kdenetwork'
%if 0%{?rhel} == 5
%__mv -f %{buildroot}%{_sysconfdir}/lisarc %{buildroot}%{_sysconfdir}/lisarc.tde
%endif
%post
/sbin/chkconfig --add lisa ||:
for f in crystalsvg hicolor locolor ; do
@ -264,6 +269,9 @@ for f in crystalsvg hicolor locolor ; do
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
if [ -r %{_sysconfdir}/lisarc.tde ] && [ ! -r %{_sysconfdir}/lisarc ]; then
cp -f %{_sysconfdir}/lisarc.tde %{_sysconfdir}/lisarc
fi
%postun
for f in crystalsvg hicolor locolor ; do
@ -433,7 +441,7 @@ done
%else
%attr(4755,root,root) %{_bindir}/kppp
%endif
%config(noreplace) %{_sysconfdir}/lisarc
%config(noreplace) %{_sysconfdir}/lisarc*
%config(noreplace) %{_initrddir}/lisa
%{_libdir}/libkdeinit_*.so
%{tde_libdir}/*
@ -465,6 +473,9 @@ done
%changelog
* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Removes conflict on file 'lisarc' for RHEL 5
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15

@ -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

@ -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

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 1
%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"
@ -25,6 +25,9 @@ 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}
@ -40,6 +43,7 @@ Requires: trinity-kdenetwork >= %{version}
Requires: trinity-kdepim >= %{version}
Requires: trinity-kdeutils >= %{version}
Requires: trinity-kdetoys >= %{version}
Requires: trinity-repo >= %{version}
%description
The TDE project aims to keep the KDE3.5 computing style alive, as well as
@ -86,6 +90,25 @@ 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
@ -94,3 +117,10 @@ Requires: %{name}-extras == %{version}
%files extras
%files all
%files -n trinity-repo
%{_sysconfdir}/yum.repos.d/*.repo
%changelog
* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Add 'repo' package

@ -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

@ -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

@ -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
Loading…
Cancel
Save