rpms/kdebase-workspace/devel kdebase-workspace-4.0.0-redhat-startkde.patch, NONE, 1.1 kdebase-workspace.spec, 1.15, 1.16 kdebase-workspace-3.96.1-redhat-startkde.patch, 1.1, NONE kdebase-workspace-3.97.0-creategtkrc-gtk212.patch, 1.1, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.0.0-redhat-startkde.patch 
Removed Files:
	kdebase-workspace-3.96.1-redhat-startkde.patch 
	kdebase-workspace-3.97.0-creategtkrc-gtk212.patch 
Log Message:
- update redhat-startkde patch

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

--- NEW FILE kdebase-workspace-4.0.0-redhat-startkde.patch ---
diff -ur kdebase-workspace-4.0.0/startkde.cmake kdebase-workspace-4.0.0-redhat-startkde/startkde.cmake
--- kdebase-workspace-4.0.0/startkde.cmake	2008-01-05 00:55:50.000000000 +0100
+++ kdebase-workspace-4.0.0-redhat-startkde/startkde.cmake	2008-01-08 00:52:06.000000000 +0100
@@ -2,6 +2,53 @@
 #
 #  DEFAULT KDE STARTUP SCRIPT ( @KDE_VERSION_STRING@ )
 #
+#  Modified for Red Hat Linux
+
+unset BLOCK_SIZE # breaks parsing of df output
+shopt -u -o noclobber # allow overwriting of files with '>'
+
+# set up user environment if not present
+# check for space on /tmp and "$HOME" and for write access
+#  error exit, if not
+space_tmp=`LANG=C df /tmp | xargs | cut -d" " -f11`
+homedir_mount=`LANG=C df "$HOME" | xargs | cut -d" " -f8`
+
+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
+    # check for AFS
+    space_home=`LANG=C fs df "$HOME" | xargs | cut -d" " -f10`
+else
+    # check regular mounts
+    space_home=`LANG=C df "$HOME" | xargs | cut -d" " -f11`
+fi
+
+if [ $space_tmp -lt 50 ]; then
+    echo $"Not enough free disk space on /tmp"
+    exit 1
+fi
+
+if [ $space_home -lt 25 ]; then
+    echo $"Not enough free disk space on "$HOME""
+    exit 1
+fi
+testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX`
+testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX`
+
+if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then
+    echo $"You don't have write permissions for /tmp"
+    exit 1
+fi
+rm -f $testfile_tmp
+
+if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then
+     echo $"You don't have write permissions for "$HOME""
+     exit 1
+fi
+rm -f $testfile_home
+
+[ -d "$HOME"/.kde/share/config ] || mkdir -p "$HOME"/.kde/share/config
+if [ ! -e "$HOME"/.kde/share/config/emaildefaults ]; then
+  /usr/bin/mailsettings >"$HOME"/.kde/share/config/emaildefaults
+fi
 
 # When the X server dies we get a HUP signal from xinit. We must ignore it
 # because we still need to do some cleanup.
@@ -14,12 +61,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
@@ -182,8 +229,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 +435,8 @@
 echo 'startkde: Running shutdown scripts...'  1>&2
 
 # Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kdebase-workspace.spec	7 Jan 2008 23:21:47 -0000	1.15
+++ kdebase-workspace.spec	8 Jan 2008 00:00:58 -0000	1.16
@@ -14,7 +14,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: kdebase-workspace-3.97.0-plasma-pager.patch
-Patch1: kdebase-workspace-3.96.1-redhat-startkde.patch
+Patch1: kdebase-workspace-4.0.0-redhat-startkde.patch
 Patch2: kdebase-workspace-3.96.2-consolekit-kdm.patch
 
 # upgrade path for former kde-redhat'ers
@@ -213,6 +213,7 @@
 * Mon Jan 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.0-1
 - update to 4.0.0
 - drop upstreamed creategtkrc-gtk212 patch
+- update redhat-startkde patch
 
 * Mon Dec 31 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.97.0-5
 - fix createGtkrc to set tooltip colors also for GTK+ 2.12+


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


--- kdebase-workspace-3.97.0-creategtkrc-gtk212.patch DELETED ---