rpms/kdebase-workspace/devel kdebase-workspace-4.2.1-redhat-startkde.patch, NONE, 1.1 kdebase-workspace.spec, 1.194, 1.195 solid-bluetoothTrunkTo42.diff, 1.1, 1.2 kdebase-workspace-4.1.82-redhat-startkde.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7091

Modified Files:
	kdebase-workspace.spec solid-bluetoothTrunkTo42.diff 
Added Files:
	kdebase-workspace-4.2.1-redhat-startkde.patch 
Removed Files:
	kdebase-workspace-4.1.82-redhat-startkde.patch 
Log Message:
adapt patches for 4.2.1


kdebase-workspace-4.2.1-redhat-startkde.patch:

--- NEW FILE kdebase-workspace-4.2.1-redhat-startkde.patch ---
diff -up kdebase-workspace-4.2.1/startkde.cmake.redhat-startkde kdebase-workspace-4.2.1/startkde.cmake
--- kdebase-workspace-4.2.1/startkde.cmake.redhat-startkde	2009-02-27 13:42:15.000000000 +0100
+++ kdebase-workspace-4.2.1/startkde.cmake	2009-03-01 12:40:54.000000000 +0100
@@ -19,33 +19,17 @@ elif test $kcheckrunning_result -eq 2 ; 
         exit 1
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
+  xsetroot -solid "#103D77"
 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
@@ -83,6 +67,13 @@ kcmrandrrc [Screen3]
 kcmfonts General forceFontDPI 0
 kdeglobals Locale Language '' # trigger requesting languages from KLocale
 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
@@ -203,8 +194,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
@@ -417,7 +409,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


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- kdebase-workspace.spec	27 Feb 2009 15:24:06 -0000	1.194
+++ kdebase-workspace.spec	1 Mar 2009 17:13:52 -0000	1.195
@@ -15,7 +15,7 @@
 URL: http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: kdebase-workspace-4.1.82-redhat-startkde.patch
+Patch1: kdebase-workspace-4.2.1-redhat-startkde.patch
 Patch2: kdebase-workspace-4.1.72-plasma-konsole.patch
 Patch3: kdebase-workspace-4.2.0-show-systemsettings.patch
 Patch4: kdebase-workspace-4.0.72-ck-shutdown.patch

solid-bluetoothTrunkTo42.diff:

Index: solid-bluetoothTrunkTo42.diff
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/solid-bluetoothTrunkTo42.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- solid-bluetoothTrunkTo42.diff	29 Jan 2009 18:30:21 -0000	1.1
+++ solid-bluetoothTrunkTo42.diff	1 Mar 2009 17:13:52 -0000	1.2
@@ -1,15 +1,3 @@
-Index: solid_bluez.desktop
-===================================================================
---- solid_bluez.desktop	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
-+++ solid/bluez/solid_bluez.desktop	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
-@@ -7,7 +7,6 @@
- Name=BlueZ
- Name[hi]=ब्लूज़
- Name[kn]=ಬ್ಲೂಜ಼್
--Name[mai]=ब्लूज
- Name[ne]=ब्लुZ
- Name[sr]=БлуЗ
- Name[x-test]=xxBlueZxx
 Index: bluez-bluetoothinterface.cpp
 ===================================================================
 --- bluez-bluetoothinterface.cpp	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)


--- kdebase-workspace-4.1.82-redhat-startkde.patch DELETED ---