[kde-workspace/f17] - remove obsolete stuffs in startkde, kde-4.6.x already uses QLocale to try obtain a default count

[Than Ngo]

commit 6706b42a9fb662539e12afd8b31f642324676e93
Author: Than Ngo <than at redhat.com>
Date:   Thu Jul 12 14:47:20 2012 +0200

    - remove obsolete stuffs in startkde, kde-4.6.x already uses QLocale
      to try obtain a default country.

 kde-workspace-4.7.97-redhat_startkde.patch |  101 ----------------------------
 kde-workspace-4.8-redhat_startkde.patch    |   63 +++++++++++++++++
 kde-workspace.spec                         |    8 ++-
 3 files changed, 69 insertions(+), 103 deletions(-)
---
diff --git a/kde-workspace-4.8-redhat_startkde.patch b/kde-workspace-4.8-redhat_startkde.patch
new file mode 100644
index 0000000..f08cb84
--- /dev/null
+++ b/kde-workspace-4.8-redhat_startkde.patch
@@ -0,0 +1,63 @@
+diff -up kde-workspace-4.7.97/startkde.cmake.redhat_startkde kde-workspace-4.7.97/startkde.cmake
+--- kde-workspace-4.7.97/startkde.cmake.redhat_startkde	2012-01-03 13:43:14.000000000 -0600
++++ kde-workspace-4.7.97/startkde.cmake	2012-01-04 06:43:55.711665134 -0600
+@@ -28,22 +28,6 @@ fi
+ # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+ unset DYLD_FORCE_FLAT_NAMESPACE
+ 
+-# in case we have been started with full pathname spec without being in PATH
+-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+-if [ -n "$bindir" ]; then
+-  qbindir=`$bindir/kde4-config --qt-binaries`
+-  if [ -n "$qbindir" ]; then
+-    case $PATH in
+-      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
+-      *) PATH=$qbindir:$PATH; export PATH;;
+-    esac
+-  fi
+-  case $PATH in
+-    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
+-    *) PATH=$bindir:$PATH; export PATH;;
+-  esac
+-fi
+-
+ # Boot sequence:
+ #
+ # kdeinit is used to fork off processes which improves memory usage
+@@ -81,7 +96,15 @@ krandrrc [Screen2]
+ krandrrc [Screen3]
+ kcmfonts General forceFontDPI 0
+ kdeglobals Locale Language '' # trigger requesting languages from KLocale
++kdeglobals Locale Country ''
+ EOF
++# read the default KSplash theme to use out of kde-settings
++if [ -e /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc ]
++  then eval `grep '^Theme=' /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc`
++       if [ -n "$Theme" ]
++         then sed -i -e "s/Default/$Theme/g" $kdehome/share/config/startupconfigkeys
++       fi
++fi
+ kstartupconfig4
+ returncode=$?
+ if test $returncode -ne 0; then
+@@ -159,8 +182,9 @@ fi
+ # better use the Autostart folder.
+ 
+ libpath=`kde4-config --path lib | tr : '\n'`
++envpath=/etc/kde/env/
+ 
+-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
++for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'` $envpath ; do
+   for file in "$prefix"*.sh; do
+     test -r "$file" && . "$file"
+   done
+@@ -369,7 +393,8 @@ kde3 dcopserver_shutdown --wait 2>/dev/n
+ echo 'startkde: Running shutdown scripts...'  1>&2
+ 
+ # Run scripts found in $KDEDIRS/shutdown
+-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do
++shutdownpath=/etc/kde/shutdown/
++for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'` $shutdownpath; do
+   for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
+     test -x "$prefix$file" && "$prefix$file"
+   done
diff --git a/kde-workspace.spec b/kde-workspace.spec
index f46a120..26e4371 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -11,7 +11,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.8.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -25,7 +25,7 @@ Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/kde-workspace-%{vers
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # RH/Fedora-specific startkde changes
-Patch1: kde-workspace-4.7.97-redhat_startkde.patch
+Patch1: kde-workspace-4.8-redhat_startkde.patch
 
 # add konsole menuitem
 Patch2: kdebase-workspace-4.5.0-plasma-konsole.patch
@@ -982,6 +982,10 @@ fi
 
 
 %changelog
+* Thu Jul 12 2012 Than Ngo <than at redhat.com> - 4.8.4-3
+- remove obsolete stuffs in startkde, kde-4.6.x already uses QLocale
+  to try obtain a default country.
+
 * Thu Jun 07 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8.4-2
 - upstream ksysguard patches