rpms/kdebase-workspace/devel kdebase-workspace-4.1.2-redhat-startkde.patch, NONE, 1.1 kdebase-workspace.spec, 1.130, 1.131 kdebase-workspace-4.0.3-redhat-startkde.patch, 1.2, NONE

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.1.2-redhat-startkde.patch 
Removed Files:
	kdebase-workspace-4.0.3-redhat-startkde.patch 
Log Message:
* Sun Nov 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-10
- never touch PATH in startkde, prepending $QTDIR/bin is unnecessary on Fedora
  and breaks locating Qt 3 Assistant and other Qt 3 stuff (startkde gets run
  with a full path by KDM)

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

--- NEW FILE kdebase-workspace-4.1.2-redhat-startkde.patch ---
diff -ur kdebase-workspace-4.1.2/startkde.cmake kdebase-workspace-4.1.2-redhat-startkde/startkde.cmake
--- kdebase-workspace-4.1.2/startkde.cmake	2008-07-15 21:49:02.000000000 +0200
+++ kdebase-workspace-4.1.2-redhat-startkde/startkde.cmake	2008-11-02 09:54:03.000000000 +0100
@@ -19,33 +19,17 @@
         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 @@
 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
 if test $? -ne 0; then
     xmessage -geometry 500x100 "Could not start kstartupconfig4. Check your installation."
@@ -202,8 +193,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
@@ -414,7 +406,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.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- kdebase-workspace.spec	2 Nov 2008 08:58:52 -0000	1.130
+++ kdebase-workspace.spec	2 Nov 2008 09:07:27 -0000	1.131
@@ -3,14 +3,14 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.1.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{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.3-redhat-startkde.patch
+Patch1: kdebase-workspace-4.1.2-redhat-startkde.patch
 Patch2: kdebase-workspace-4.0.98-consolekit-kdm.patch
 Patch3: kdebase-workspace-4.0.72-plasma-konsole.patch
 Patch4: kdebase-workspace-4.1.1-show-systemsettings.patch
@@ -353,6 +353,11 @@
 
 
 %changelog
+* Sun Nov 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-10
+- never touch PATH in startkde, prepending $QTDIR/bin is unnecessary on Fedora
+  and breaks locating Qt 3 Assistant and other Qt 3 stuff (startkde gets run
+  with a full path by KDM)
+
 * Sat Nov 01 2008 Than Ngo <than at redhat.com> 4.1.2-9
 - previous session button should be enabled
 


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