rpms/kdebase-workspace/devel kdebase-workspace-4.0.3-redhat-startkde.patch, NONE, 1.1 kdebase-workspace.spec, 1.64, 1.65 kdebase-workspace-4.0.1-redhat-startkde.patch, 1.2, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5326/devel

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.0.3-redhat-startkde.patch 
Removed Files:
	kdebase-workspace-4.0.1-redhat-startkde.patch 
Log Message:
* Wed Apr 09 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-10
- read the default KSplash theme from kde-settings in startkde (#441565)

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

--- NEW FILE kdebase-workspace-4.0.3-redhat-startkde.patch ---
diff -ur kdebase-workspace-4.0.3/startkde.cmake kdebase-workspace-4.0.3-redhat-startkde/startkde.cmake
--- kdebase-workspace-4.0.3/startkde.cmake	2008-03-27 21:34:53.000000000 +0100
+++ kdebase-workspace-4.0.3-redhat-startkde/startkde.cmake	2008-04-09 18:33:45.000000000 +0200
@@ -14,12 +14,12 @@
 	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 "#5477A0"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@@ -74,6 +74,13 @@
 kcmrandrrc [Screen3]
 kcmfonts General forceFontDPI 0
 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
 if test $? -ne 0; then
     xmessage -geometry 500x100 "Could not start kstartupconfig4. Check your installation."
@@ -182,8 +189,9 @@
 # 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
@@ -387,7 +395,8 @@
 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/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- kdebase-workspace.spec	9 Apr 2008 15:26:28 -0000	1.64
+++ kdebase-workspace.spec	9 Apr 2008 16:47:10 -0000	1.65
@@ -6,14 +6,14 @@
 Name: kdebase-workspace
 Version: 4.0.3
 
-Release: 7%{?dist}
+Release: 10%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: kdebase-workspace-4.0.1-redhat-startkde.patch
+Patch1: kdebase-workspace-4.0.3-redhat-startkde.patch
 Patch2: kdebase-workspace-4.0.0-consolekit-kdm.patch
 Patch3: kdebase-workspace-4.0.2-plasma-konsole.patch
 Patch4: kdebase-workspace-4.0.2-onlyshowkde.patch
@@ -243,6 +243,9 @@
 
 
 %changelog
+* Wed Apr 09 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-10
+- read the default KSplash theme from kde-settings in startkde (#441565)
+
 * Mon Apr 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-7
 - own %%{_kde4_appsdir}/kdm/faces and set default user image (#441154)
 


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