RHEL/Fedora: fix KDEDIRS in startkde (kdebase)

5 files changed, 128 insertions, 4 deletions

diff --git a/redhat/kdebase/kdebase-3.5.12-startkde_directories.patch b/redhat/kdebase/kdebase-3.5.12-startkde_directories.patch
new file mode 100644
index 000000000..393903059
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.12-startkde_directories.patch
@@ -0,0 +1,19 @@
+--- kdebase/startkde.ORI	2011-12-11 18:55:25.873027885 +0100
++++ kdebase/startkde	2011-12-11 18:56:37.885065246 +0100
+@@ -144,14 +144,14 @@
+ fi
+ if [ -d /opt/kde3 ]; then
+   if [ -n "$KDEDIRS" ]; then
+-    export KDEDIRS=$KDEDIRS:/opt/kde3/:/usr/
++    export KDEDIRS=/opt/kde3/:$KDEDIRS:/usr/
+   else
+     export KDEDIRS=/opt/kde3/:/usr/
+   fi
+ fi
+ if [ -d /opt/trinity ]; then
+   if [ -n "$KDEDIRS" ]; then
+-    export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/
++    export KDEDIRS=/opt/trinity/:$KDEDIRS:/usr/
+   else
+     export KDEDIRS=/opt/trinity/:/usr/
+   fi
diff --git a/redhat/kdebase/kdebase-3.5.13-startkde_directories.patch b/redhat/kdebase/kdebase-3.5.13-startkde_directories.patch
new file mode 100644
index 000000000..27826bda2
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-startkde_directories.patch
@@ -0,0 +1,95 @@
+--- 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 @@
+   echo "[startkde] KDEHOME is preset to $KDEHOME." 1>&2
+   export KDEHOME=$KDEHOME
+ else
+-  # $KDEHOME is NOT already preset in the environment. Try to help.
+-  # This might be overkill but does provide flexibility.
++  # $KDEHOME is NOT already preset in the environment.
++  # We always use ~/.trinity as default.
+   echo "[startkde] KDEHOME is not set." 1>&2
+-  if [ -d $HOME/.trinity ]; then
+-    # OK, this one is obvious.
+-    export KDEHOME=$HOME/.trinity
+-  elif [ -d $HOME/.trinity ]; then
+-    # Looks like the user had an old version of Trinity installed at last login
+-    echo "[startkde] Migrating old ~/.trinity directory to new ~/.trinity name." 1>&2
+-    mv $HOME/.trinity $HOME/.trinity
+-    export KDEHOME=$HOME/.trinity
+-  elif [ -f /usr/bin/kde4-config ]; then
+-    # Looks like KDE4 is installed.
+-    if [ -d $HOME/.kde ] && [ ! -d $HOME/.trinity ]; then
+-      # Presume $HOME/.kde is being used for KDE4 as it already exists.
+-      export KDEHOME=$HOME/.trinity
+-    else
+-      # Presume $HOME/.kde is being used for KDE4 to be on the safe side.
+-      export KDEHOME=$HOME/.trinity
+-    fi
+-  elif [ -f /opt/trinity/bin/kde-config ]; then
+-    # Looks like KDE3 or Trinity is installed and playing second fiddle to KDE4.
+-    export KDEHOME=$HOME/.trinity
+-  elif [ -f /opt/trinity/bin/kde-config ]; then
+-    # Looks like KDE3 or Trinity is installed and playing second fiddle to KDE4.
+-    export KDEHOME=$HOME/.trinity
+-  elif [ -f /usr/bin/kde-config ] && [ -d $HOME/.kde ]; then
+-    # Looks like KDE3 or Trinity is installed and not playing second fiddle to KDE4.
+-    export KDEHOME=$HOME/.kde
+-  else
+-    # Resort to this and hope for the best!
+-    export KDEHOME=$HOME/.trinity
+-  fi
++  export KDEHOME=$HOME/.trinity
+   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
+ fi
+-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/share ]; then
+-  export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/:/usr/share/
+-fi
+ 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/
+ fi
+ if [ -d /opt/trinity/etc/xdg ]; then
+-  export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/:/etc/xdg/
+-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/
+ fi
+ if [ -d /opt/trinity/share/man ]; then
+   export MANPATH=/opt/trinity/share/man:$MANPATH
+ fi
+-if [ -d /opt/trinity/share/man ]; then
+-  export MANPATH=/opt/trinity/share/man:$MANPATH
+-fi
+-if [ -d /opt/trinity ]; then
+-  if [ -n "$KDEDIRS" ]; then
+-    export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/
+-  else
+-    export KDEDIRS=/opt/trinity/:/usr/
+-  fi
+-fi
+ 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}
+ fi
+ 
+ test -n "$KDEHOME" && kdehome=`echo "$KDEHOME" | sed "s,^~/,$HOME/,"`
diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec
index 0623081ba..721c1d781 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.12.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec
@@ -82,6 +82,8 @@ Patch13:	kdebase-3.5.13-genkdmconf_Xsession_location.patch
 Patch14:	kdebase-3.5.12-kickoff_unstable.patch
 ## [kdebase/startkde] Sets default Start Icon in 'kickerrc'
 Patch15:	kdebase-3.5.13-startkde_icon.patch
+## [kdebase/startkde] Fixes duplicate and incorrect TDE directories location
+Patch16:	kdebase-3.5.12-startkde_directories.patch
 
 # TDE unofficial patches for enhanced features
 ## [kdebase/kate] Restores the 'number of files' and sorting widgets to the Kate configuration
@@ -287,6 +289,7 @@ Protocol handlers (KIOslaves) for personal information management, including:
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %patch20 -p4
 %if 0%{?rhel} > 0
@@ -667,13 +670,14 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_libdir}/libkdeinit_*.*
 
 %changelog
-* Thu Dec 08 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-13
+* Thu Dec 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-13
 - Backports patches from TDE 3.5.13-10
 - Removes Kubuntu branding [TDE Bug #449]
 - Fix 'kio_man' on RHEL 5 and RHEL 6 [TDE Bug #714]
 - Restores the 'number of files' and sorting widgets to the Kate configuration [TDE Bug #244]
 - Re-enables 'open tab in background' konqueror feature [TDE Bug #245]
 - Fix error message 'cannot find parent folder' on konqueror sidebar
+- Fix KDEDIRS and other variables in 'startkde', that messes up translations.
 
 * Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-12
 - Updates Kickoff menu Fix [TDE Bugs #281, #508]
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index 41937187a..bde17d9a5 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 11
+%define release 12
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -74,6 +74,8 @@ Patch13:	kdebase-3.5.13-genkdmconf_Xsession_location.patch
 Patch14:	kdebase-3.5.13-kickoff_unstable.patch
 ## [kdebase/startkde] Sets default Start Icon in 'kickerrc'
 Patch15:	kdebase-3.5.13-startkde_icon.patch
+## [kdebase/startkde] Fixes duplicate and incorrect TDE directories location
+Patch16:	kdebase-3.5.13-startkde_directories.patch
 
 # TDE unofficial patches for enhanced features
 ## [kdebase/kate] Restores the 'number of files' and sorting widgets to the Kate configuration
@@ -272,6 +274,7 @@ Protocol handlers (KIOslaves) for personal information management, including:
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %patch20 -p4
 %if 0%{?rhel} > 0
@@ -663,8 +666,11 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/cmake/*.cmake
 
 %changelog
+* Sun Dec 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-12
+- Fix KDEDIRS and other variables in 'startkde', that messes up translations.
+
 * Sat Dec 10 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-11
-- Fix error message 'cannot find parent folder' on konqueror sidebar
+- Fix error message 'cannot find parent folder' on konqueror sidebar.
 
 * Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-10
 - Removes Kubuntu branding [TDE Bug #449]
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
index aafc9b34c..7732731f0 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
@@ -326,7 +326,7 @@ EOF
 
 %changelog
 * Fri Dec 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-10
-- Fix conflict with 
+- Fix conflict with distro-provided KDE
 - Fix HTML directory location
 - Change defaults TDE directory to '/etc/trinity' and '~/.trinity'
 - Removes 'ld.so.conf.d' when installed under '/usr'