diff options
| -rw-r--r-- | redhat/applications/knetworkmanager/trinity-knetworkmanager.spec | 9 | ||||
| -rw-r--r-- | redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec | 4 | ||||
| -rwxr-xr-x | redhat/genrpm.sh | 33 | ||||
| -rw-r--r-- | redhat/kdebase/trinity-kdebase-3.5.13.spec | 27 | ||||
| -rwxr-xr-x | redhat/kdelibs/trinity-kdelibs-3.5.13.spec | 16 | ||||
| -rw-r--r-- | redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec | 14 | ||||
| -rw-r--r-- | redhat/trinity-desktop/trinity-desktop.spec | 1 | ||||
| -rw-r--r-- | redhat/trinity-live/fedora-live-tde-base.ks | 21 | ||||
| -rw-r--r-- | redhat/trinity-live/fedora-livecd-tde.ks | 16 |
9 files changed, 112 insertions, 29 deletions
diff --git a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec index b561200b4..1c45101ff 100644 --- a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec +++ b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec @@ -5,7 +5,7 @@ %else %define version 0.8 %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" @@ -77,7 +77,7 @@ Development headers for knetworkmanager cd knetworkmanager-0.*/src %patch0 -p3 -%patch1 -p3 +#patch1 -p3 @@ -142,5 +142,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{tde_libdir}/*.so %changelog -* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 +* Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2 / 0.9-2 +- Remove faulty patch for WPA authentication + +* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 / 0.9-1 - Initial build diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec index 02e7734f1..27a167636 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec @@ -37,8 +37,6 @@ BuildRequires: gcc-c++ BuildRequires: dbus-devel BuildRequires: tqtinterface-devel -#Provides: dbus-1-qt - %description Dbus TQT Interface @@ -54,7 +52,7 @@ Development files for %{name} %prep %setup -q -n dependencies/%{name} -%patch0 -p1 +#patch0 -p1 %build unset QTDIR || : ; . /etc/profile.d/qt.sh diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index d54c88c21..c0627d032 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -5,6 +5,7 @@ cd "$( dirname "$0" )" while [ $# -gt 0 ]; do case "$1" in "--auto") AUTO=1;; + "--version") REQVERSION="$2"; shift;; *) COMP="$1";; esac shift @@ -12,6 +13,7 @@ done clear cat <<EOF +$(< /etc/redhat-release) $(uname -m) This script generates RPM of TDE from source tarball. Please choose a TDE component to build. @@ -38,7 +40,11 @@ VERSION=$( awk '{ if ($1 == "'${COMP}'") { print $2; } }' components.txt ) # If no version is set in text file, get version number from source tarball name if [ -z "${VERSION}" ]; then - set $( cd "${COMP}"; echo ${COMP##*/}*.tar.gz) + if [ -n "${REQVERSION}" ]; then + set $( cd "${COMP}"; echo ${COMP##*/}*-${REQVERSION}.tar.gz) + else + set $( cd "${COMP}"; echo ${COMP##*/}*.tar.gz) + fi if [ $# -gt 1 ]; then select VERSION in $*; do break; done elif [ -r "${COMP}/$1" ]; then @@ -59,7 +65,12 @@ fi # Chooses a spec file (if many) set $( cd "${COMP}"; echo *.spec ) if [ $# -gt 1 ]; then - select SPEC in $*; do break; done + if [ -n "${REQVERSION}" ]; then + set $( cd "${COMP}"; echo *-${REQVERSION}.spec ) + SPEC="$1" + else + select SPEC in $*; do break; done + fi elif [ -r "${COMP}/$1" ]; then SPEC="$1" else @@ -86,7 +97,9 @@ esac if [ "$(rpm -q --qf '%{arch}' kernel)" = "i686" ]; then ARGS="${ARGS} --target=i686" fi - + +LOGFILE=/tmp/log.${COMP##*/} + set -x ( rpmbuild -ba \ @@ -95,6 +108,18 @@ rpmbuild -ba \ --define "version ${VERSION:-3.5.13}" \ $ARGS \ ${COMP}/${SPEC} || exit 1 -) 2>&1 | tee /tmp/log +) 2>&1 | tee ${LOGFILE} +RET=$? set +x +if [ ${RET} -gt 0 ]; then + exit ${RET} +fi + +if grep -q "error: Failed build dependencies:" ${LOGFILE}; then +# DEPS=$( sed -n -e "/.* is needed by .*/ s/^[ \t]*\([a-zA-Z2-9_-]*\) .*/\1/p" ${LOGFILE} ) + set $( grep " is needed by " ${LOGFILE} | cut -d " " -f1 ) + exit 2 +fi + + diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index f5ff987a7..faf8d13ad 100644 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 6 +%define release 7 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -63,29 +63,32 @@ Patch8: kdebase-3.5.13-startkde_ldpreload.patch Patch9: kdebase-3.5.13-mediamanager_ftbfs.patch ## [kdebase/kicker/kicker/ui] Patch10: kdebase-3.5.12-kickoff_unstable.patch +## [kdebase/startkde] Sets default Start Icon in 'kickerrc' +Patch11: kdebase-3.5.13-startkde_icon.patch + # Fedora 15 Theme: "Lovelock" %if 0%{?fedora} == 15 Requires: lovelock-backgrounds-single -%define kde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png +%define tde_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 +%define tde_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 +%define tde_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 +%define tde_bg /usr/share/backgrounds/default.png %endif BuildRequires: tqtinterface-devel @@ -217,20 +220,21 @@ Protocol handlers (KIOslaves) for personal information management, including: cd kicker/kicker %patch10 -p0 cd - +%patch11 -p1 # Applies an optional distro-specific graphical theme -%if "%{?kde_bg}" != "" +%if "%{?tde_bg}" != "" # KDM Background %__sed -i "kdm/kfrontend/genkdmconf.c" \ - -e 's,"Wallpaper=isadora.png\n","Wallpaper=%{kde_bg}\n",' + -e 's,"Wallpaper=isadora.png\n","Wallpaper=%{tde_bg}\n",' # TDE user default background %__sed -i "kpersonalizer/keyecandypage.cpp" \ - -e 's,#define DEFAULT_WALLPAPER "isadora.png",#define DEFAULT_WALLPAPER "%{kde_bg}",' + -e 's,#define DEFAULT_WALLPAPER "isadora.png",#define DEFAULT_WALLPAPER "%{tde_bg}",' %__sed -i "startkde" \ - -e 's,/usr/share/wallpapers/isadora.png.desktop,%{kde_bg},' \ - -e 's,Wallpaper=isadora.png,Wallpaper=%{kde_bg},' + -e 's,/usr/share/wallpapers/isadora.png.desktop,%{tde_bg},' \ + -e 's,Wallpaper=isadora.png,Wallpaper=%{tde_bg},' %endif %build @@ -579,6 +583,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/cmake/*.cmake %changelog +* Sun Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7 +- Add distribution-specific start button icon + * 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 diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec index 5c2652f17..abbb9a047 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec @@ -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" @@ -145,6 +145,13 @@ cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf %{tde_libdir} EOF +# Moves the XDG configuration files to TDE directory +%__install -p -D -m644 \ + "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \ + "%{?buildroot}%{_prefix}/etc/xdg/menus/kde-applications.menu" +%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg" + + %clean %__rm -rf %{?buildroot} @@ -258,8 +265,8 @@ EOF %endif %{_sysconfdir}/ld.so.conf.d/trinity.conf -# Provided by 'redhat-menus' package -%exclude %{_sysconfdir}/xdg/menus/applications.menu +# Avoid conflict with 'redhat-menus' package +%{_prefix}/etc/xdg/menus/kde-applications.menu # New in TDE 3.5.13 %{_bindir}/kdetcompmgr @@ -285,6 +292,9 @@ EOF %changelog +* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 +- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE + * Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 - Add missing BuildRequires diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec index c6e1e9ac0..c595d542c 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -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" @@ -223,6 +223,13 @@ for dir in k* ; do done done +# Moves the XDG configuration files to TDE directory +%__install -p -D -m644 \ + "%{?buildroot}%{_sysconfdir}/xdg/menus/applications-merged/kde-multimedia-music.menu" \ + "%{?buildroot}%{_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu" +%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg" + + %post /sbin/ldconfig @@ -351,7 +358,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/icons/crystalsvg/*/*/juk* %exclude %{_datadir}/icons/hicolor/*/apps/juk.png -/etc/xdg/menus/applications-merged/* +%{_prefix}/etc/xdg/menus/applications-merged/* %{_libdir}/mcop/* %{_libdir}/libkdeinit_*.so #%{_libdir}/liboggarts.so @@ -404,6 +411,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_libdir}/libyafxplayer.so %changelog +* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 +- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE + * Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 - Updates BuildRequires diff --git a/redhat/trinity-desktop/trinity-desktop.spec b/redhat/trinity-desktop/trinity-desktop.spec index c109fd82b..1820928c9 100644 --- a/redhat/trinity-desktop/trinity-desktop.spec +++ b/redhat/trinity-desktop/trinity-desktop.spec @@ -44,6 +44,7 @@ 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 diff --git a/redhat/trinity-live/fedora-live-tde-base.ks b/redhat/trinity-live/fedora-live-tde-base.ks index b56e5c92a..ed912dfff 100644 --- a/redhat/trinity-live/fedora-live-tde-base.ks +++ b/redhat/trinity-live/fedora-live-tde-base.ks @@ -9,8 +9,11 @@ repo --name=trinity-extras-noarch --baseurl=http://trinity.mangafrance.com/f$rel %packages ### The KDE-Desktop - trinity-desktop +hal + +# TDE is missing a Network Applet, so we use Gnome... +NetworkManager-gnome ### fixes @@ -81,6 +84,7 @@ 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/ @@ -91,4 +95,19 @@ sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink EOF +# 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 + %end diff --git a/redhat/trinity-live/fedora-livecd-tde.ks b/redhat/trinity-live/fedora-livecd-tde.ks index 16c799d1f..88ab2f91a 100644 --- a/redhat/trinity-live/fedora-livecd-tde.ks +++ b/redhat/trinity-live/fedora-livecd-tde.ks @@ -10,6 +10,9 @@ %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 @@ -18,12 +21,13 @@ trinity-live-openbox # Some TDE applications trinity-amarok -trinity-digikam +#trinity-digikam trinity-dolphin trinity-gwenview trinity-k3b trinity-kaffeine trinity-kbookreader +#trinity-knetworkmanager trinity-konversation trinity-ksensors trinity-kstreamripper @@ -31,13 +35,19 @@ trinity-yakuake # Some TDE translations trinity-kde-i18n-French -trinity-kde-i18n-German -#trinity-kde-i18n-Spanish +#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 |