[kdebase-workspace] - kdm is not localized when changing lang using system-config-language (#631861)

[Rex Dieter]

commit f0606a4f705e1cf74f4202cc4631c8213c76487a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 20 12:33:43 2010 -0500

    - kdm is not localized when changing lang using system-config-language (#631861)

 kdebase-workspace-4.5.1-redhat_startkde.patch |   12 +++++++-----
 kdebase-workspace.spec                        |    7 +++++--
 2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/kdebase-workspace-4.5.1-redhat_startkde.patch b/kdebase-workspace-4.5.1-redhat_startkde.patch
index b85ec41..bc3fea8 100644
--- a/kdebase-workspace-4.5.1-redhat_startkde.patch
+++ b/kdebase-workspace-4.5.1-redhat_startkde.patch
@@ -1,6 +1,6 @@
 diff -up kdebase-workspace-4.5.1/startkde.cmake.redhat-startkde kdebase-workspace-4.5.1/startkde.cmake
 --- kdebase-workspace-4.5.1/startkde.cmake.redhat-startkde	2010-08-27 03:10:26.000000000 -0500
-+++ kdebase-workspace-4.5.1/startkde.cmake	2010-08-28 13:25:57.397936681 -0500
++++ kdebase-workspace-4.5.1/startkde.cmake	2010-09-20 12:12:17.390323286 -0500
 @@ -25,33 +25,17 @@ elif test $kcheckrunning_result -eq 2 ; 
          exit 1
  fi
@@ -37,7 +37,7 @@ diff -up kdebase-workspace-4.5.1/startkde.cmake.redhat-startkde kdebase-workspac
  # Boot sequence:
  #
  # kdeinit is used to fork off processes which improves memory usage
-@@ -72,6 +56,35 @@ fi
+@@ -72,6 +56,37 @@ fi
  kdehome=$HOME/@KDE_DEFAULT_HOME@
  test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
  
@@ -50,6 +50,8 @@ diff -up kdebase-workspace-4.5.1/startkde.cmake.redhat-startkde kdebase-workspac
 +  if [ ! $LANG ]; then
 +    if [ -e /etc/default/locale ]; then
 +      localefile='/etc/default/locale'
++    elif [ -e /etc/sysconfig/i18n ]; then
++      localefile='/etc/sysconfig/i18n'
 +    elif [ -e /etc/environment ]; then
 +      localefile='/etc/environment'
 +    fi
@@ -73,7 +75,7 @@ diff -up kdebase-workspace-4.5.1/startkde.cmake.redhat-startkde kdebase-workspac
  # see kstartupconfig source for usage
  mkdir -m 700 -p $kdehome
  mkdir -m 700 -p $kdehome/share
-@@ -88,7 +101,15 @@ kcmrandrrc [Screen2]
+@@ -88,7 +103,15 @@ kcmrandrrc [Screen2]
  kcmrandrrc [Screen3]
  kcmfonts General forceFontDPI 0
  kdeglobals Locale Language '' # trigger requesting languages from KLocale
@@ -89,7 +91,7 @@ diff -up kdebase-workspace-4.5.1/startkde.cmake.redhat-startkde kdebase-workspac
  kstartupconfig4
  returncode=$?
  if test $returncode -ne 0; then
-@@ -209,8 +230,9 @@ fi
+@@ -209,8 +232,9 @@ fi
  # better use the Autostart folder.
  
  libpath=`kde4-config --path lib | tr : '\n'`
@@ -100,7 +102,7 @@ diff -up kdebase-workspace-4.5.1/startkde.cmake.redhat-startkde kdebase-workspac
    for file in "$prefix"*.sh; do
      test -r "$file" && . "$file"
    done
-@@ -423,7 +445,8 @@ kde3 dcopserver_shutdown --wait 2>/dev/n
+@@ -423,7 +447,8 @@ kde3 dcopserver_shutdown --wait 2>/dev/n
  echo 'startkde: Running shutdown scripts...'  1>&2
  
  # Run scripts found in $KDEDIRS/shutdown
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 72ba2ab..c4d6fc1 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -17,7 +17,7 @@ Version: 4.5.1
 # for .0 releases we have to use '00' as '0' is treated as null by cmake, dont' forget to update
 %define kde4workspace_version %{version} 
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -295,7 +295,7 @@ Requires: akonadi
 %setup -q -n kdebase-workspace-%{version}
 
 # RH/Fedora-specific startkde changes
-%patch1 -p1 -b .redhat-startkde
+%patch1 -p1 -b .redhat_startkde
 %patch2 -p1 -b .plasma-konsole
 %patch3 -p1 -b .systemsettings_onlyshowin_kde
 # ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22)
@@ -699,6 +699,9 @@ fi
 
 
 %changelog
+* Mon Sep 20 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-4
+- kdm is not localized when changing lang using system-config-language (#631861)
+
 * Wed Sep 15 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-3
 - Provides: firstboot(windowmanager)  (#605675)