RHEL/Fedora: fix KDEDIRS in kdebase, fix systemsettings segfault, add JACK support in ARTS

2 files changed, 58 insertions, 31 deletions

diff --git a/redhat/kdebase/kdebase-3.5.13-startkde_directories.patch b/redhat/kdebase/kdebase-3.5.13-startkde_directories.patch
index 27826bda2..504196ee4 100644
--- a/redhat/kdebase/kdebase-3.5.13-startkde_directories.patch
+++ b/redhat/kdebase/kdebase-3.5.13-startkde_directories.patch
@@ -1,6 +1,14 @@
---- kdebase/startkde.ORI	2011-12-11 18:17:16.287267447 +0100
-+++ kdebase/startkde	2011-12-11 18:35:05.876764598 +0100
-@@ -74,39 +74,10 @@
+--- kdebase/startkde.ORI	2011-12-12 20:09:21.984162840 +0100
++++ kdebase/startkde	2011-12-12 20:08:27.922834925 +0100
+@@ -4,6 +4,7 @@
+ #
+ 
+ echo "[startkde] Starting startkde." 1>&2
++export KDEDIR="${KDEDIR:-/opt/trinity}"
+ 
+ # When the X server dies we get a HUP signal from xinit. We must ignore it
+ # because we still need to do some cleanup.
+@@ -74,39 +75,10 @@
    echo "[startkde] KDEHOME is preset to $KDEHOME." 1>&2
    export KDEHOME=$KDEHOME
  else
@@ -43,10 +51,16 @@
    echo "[startkde] Set KDEHOME to $KDEHOME." 1>&2
  fi
  
-@@ -123,43 +94,20 @@
- if [ -d /opt/trinity/bin ]; then
-   export PATH=/opt/trinity/bin:$PATH
+@@ -117,51 +89,25 @@
  fi
+ 
+ # Modify the following environment variables only as necessary.
+-if [ -d /opt/trinity/games ]; then
+-  export PATH=/opt/trinity/games:$PATH
+-fi
+-if [ -d /opt/trinity/bin ]; then
+-  export PATH=/opt/trinity/bin:$PATH
+-fi
 -if [ -d /opt/trinity/games ]; then
 -  export PATH=/opt/trinity/games:$PATH
 -fi
@@ -56,21 +70,25 @@
 -if [ -d /opt/trinity/share ]; then
 -  export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/:/usr/share/
 -fi
- if [ -d /opt/trinity/share ]; then
+-if [ -d /opt/trinity/share ]; then
 -  export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/:/usr/share/
-+  # Do NOT add /usr/share, it is supposed to be already there !
-+  export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/
++if [ -d ${KDEDIR}/games ]; then
++  export PATH=${KDEDIR}/games:$PATH
  fi
- if [ -d /opt/trinity/etc/xdg ]; then
+-if [ -d /opt/trinity/etc/xdg ]; then
 -  export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/:/etc/xdg/
--fi
++if [ -d ${KDEDIR}/bin ]; then
++  export PATH=${KDEDIR}/bin:$PATH
+ fi
 -if [ -d /opt/trinity/etc/xdg ]; then
 -  export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/:/etc/xdg/
-+  # Do NOT add /etc/xdg, it is supposed to be already there !
-+  export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/
++if [ -d ${KDEDIR}/share ]; then
++  export XDG_DATA_DIRS=$XDG_DATA_DIRS:${KDEDIR}/share/:/usr/share/
  fi
- if [ -d /opt/trinity/share/man ]; then
-   export MANPATH=/opt/trinity/share/man:$MANPATH
+-if [ -d /opt/trinity/share/man ]; then
+-  export MANPATH=/opt/trinity/share/man:$MANPATH
++if [ -d ${KDEDIR}/etc/xdg ]; then
++  export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:${KDEDIR}/etc/xdg/:/etc/xdg/
  fi
 -if [ -d /opt/trinity/share/man ]; then
 -  export MANPATH=/opt/trinity/share/man:$MANPATH
@@ -82,14 +100,19 @@
 -    export KDEDIRS=/opt/trinity/:/usr/
 -  fi
 -fi
- if [ -d /opt/trinity ]; then
+-if [ -d /opt/trinity ]; then
 -  if [ -n "$KDEDIRS" ]; then
 -    export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/
 -  else
 -    export KDEDIRS=/opt/trinity/:/usr/
 -  fi
-+  # The TDE directory should appear BEFORE '/usr' in KDEDIRS variable !
-+  export KDEDIRS=${KDEDIR}/:${KDEDIRS}
++if [ -d ${KDEDIR}/share/man ]; then
++  export MANPATH=${KDEDIR}/share/man:$MANPATH
  fi
  
++# The TDE directory must be first in $KDEDIRS
++export KDEDIRS=${KDEDIR}/:$KDEDIRS:/usr/
++
  test -n "$KDEHOME" && kdehome=`echo "$KDEHOME" | sed "s,^~/,$HOME/,"`
+ echo "[startkde] kdehome: $kdehome" 1>&2
+ 
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index bde17d9a5..82c442819 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 12
+%define release 13
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -288,7 +288,7 @@ Protocol handlers (KIOslaves) for personal information management, including:
 # KDM Background
 %__sed -i "kdm/kfrontend/genkdmconf.c" \
 	-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 "%{tde_bg}",'
@@ -309,6 +309,10 @@ Protocol handlers (KIOslaves) for personal information management, including:
 %__sed -i "kdm/config.def" \
 	-e "s|Welcome to Trinity |Welcome to %{tde_aboutlabel} |"
 
+# TDE default directory in 'startkde' script (KDEDIR)
+%__sed -i "startkde" \
+	-e "s|/opt/trinity|%{_prefix}|g"
+
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
@@ -364,12 +368,10 @@ cd build
 %__sed -i "%{?buildroot}%{_usr}/share/xsessions/tde.desktop" \
 	-e "s,^Name=.*,Name=TDE,"
 
-# Modifies 'startkde' to set KDEDIR and KDEHOME hardcoded specific for TDE
-%__sed -i "%{?buildroot}%{_bindir}/startkde" \
-	-e '/^echo "\[startkde\] Starting startkde.".*/ s,$,\nexport KDEDIR=%{_prefix}\nexport KDEHOME=~/.trinity,'
-
 # Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard'
-%__mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
+%__mv -f \
+	%{?buildroot}%{_sysconfdir}/ksysguarddrc \
+	%{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
 
 # TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
 %if "%{?_prefix}" != "/usr"
@@ -377,11 +379,10 @@ cd build
 %endif
 
 # PAM configuration files
-%__mkdir_p "%{?buildroot}%{_sysconfdir}/pam.d"
-%__install -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity"
-%__install -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np"
-%__install -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
-%__install -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity"
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity"
+%__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np"
+%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
+%__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity"
 
 # KDM configuration for RHEL/Fedora
 %__sed -i "%{?buildroot}%{_datadir}/config/kdm/kdmrc" \
@@ -406,7 +407,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg  2> /dev/null || :
 update-desktop-database 2> /dev/null || : 
 # Dirty hack to install '/etc/ksysguardrc' alongside with KDE4
-[ -r %{_sysconfdir}/ksysguarddrc ] || cp -f %{_sysconfdir}/ksysguarddrc.tde %{_sysconfdir}/ksysguarddrc
+[ -r "%{_sysconfdir}/ksysguarddrc" ] || cp -f "%{_sysconfdir}/ksysguarddrc.tde" "%{_sysconfdir}/ksysguarddrc"
 
 %postun
 touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
@@ -666,6 +667,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/cmake/*.cmake
 
 %changelog
+* Mon Dec 12 2011 Francois Andriot <[email protected]> - 3.5.13-13
+- Fix variables (again)
+
 * Sun Dec 11 2011 Francois Andriot <[email protected]> - 3.5.13-12
 - Fix KDEDIRS and other variables in 'startkde', that messes up translations.