rpms/kdebase/FC-6 kdebase-3.5.7-1-redhat-startkde.patch, NONE, 1.1 .cvsignore, 1.54, 1.55 kdebase.spec, 1.246, 1.247 sources, 1.76, 1.77 kdebase-3.5.4-antialias.patch, 1.1, NONE kdebase-3.5.6-1-redhat-startkde.patch, 1.1, NONE

[fedora-cvs-commits redhat com]

Author: than

Update of /cvs/dist/rpms/kdebase/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv30266

Modified Files:
	.cvsignore kdebase.spec sources 
Added Files:
	kdebase-3.5.7-1-redhat-startkde.patch 
Removed Files:
	kdebase-3.5.4-antialias.patch 
	kdebase-3.5.6-1-redhat-startkde.patch 
Log Message:
3.5.7


kdebase-3.5.7-1-redhat-startkde.patch:
 startkde |   67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 58 insertions(+), 9 deletions(-)

--- NEW FILE kdebase-3.5.7-1-redhat-startkde.patch ---
--- kdebase-3.5.5/startkde.redhat	2006-10-02 13:13:29.000000000 +0200
+++ kdebase-3.5.5/startkde	2006-10-10 17:35:53.000000000 +0200
@@ -1,7 +1,54 @@
 #!/bin/sh
 #
 #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.7 )
-#
+#  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 blue
 # 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
@@ -61,7 +108,7 @@
 cat >$kdehome/share/config/startupconfigkeys <<EOF
 kcminputrc Mouse cursorTheme ''
 kcminputrc Mouse cursorSize ''
-kpersonalizerrc General FirstLogin true
+kpersonalizerrc General FirstLogin false
 ksplashrc KSplash Theme Default
 kcmrandrrc Display ApplyOnStartup false
 kcmrandrrc [Screen0]
@@ -157,8 +204,8 @@
 EOF
 fi
 
-# Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh
-# (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is installed)
+# Source scripts found in <localprefix>/env/*.sh and /etc/kde/env/*.sh
+# (where <localprefix> is $KDEHOME or ~/.kde)
 #
 # This is where you can define environment variables that will be available to
 # all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
@@ -170,9 +217,10 @@
 # better use the Autostart folder.
 
 exepath=`kde-config --path exe | tr : '\n'`
+envpath=/etc/kde/env/
 
-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'`; do
-  for file in "$prefix"*.sh; do
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'` $envpath ; do
+  for file in "$prefix"*.sh ; do
     test -r "$file" && . "$file"
   done
 done
@@ -378,7 +426,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 "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'` $shutdownpath; do
   for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
     test -x "$prefix$file" && "$prefix$file"
   done


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-6/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	26 Oct 2006 15:36:19 -0000	1.54
+++ .cvsignore	5 Jun 2007 14:33:12 -0000	1.55
@@ -28,3 +28,5 @@
 kde-redhat-config-3.5-fc5-0.4.tar.bz2
 kde-redhat-config-3.5-fc5-0.5.tar.bz2
 kdebase-3.5.5.tar.bz2
+kde-redhat-config-3.5-fc6-1.tar.bz2
+kdebase-3.5.7.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-6/kdebase.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- kdebase.spec	14 Feb 2007 17:35:58 -0000	1.246
+++ kdebase.spec	5 Jun 2007 14:33:12 -0000	1.247
@@ -6,9 +6,9 @@
 %define redhatify 1
 %define include_kappfinder 0
 
-%define qt_version 3.3.7
-%define arts_version 1.5.6
-%define kde_version 3.5.6
+%define qt_version 3.3.8
+%define arts_version 1.5.7
+%define kde_version 3.5.7
 %define kdelibs_epoch 6
 %define arts_epoch 8
 %define make_cvs 1
@@ -17,8 +17,8 @@
 
 Summary: K Desktop Environment - core files
 Name: kdebase
-Version: 3.5.6
-Release: 0.2%{?dist}
+Version: 3.5.7
+Release: 0.1%{?dist}
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -28,7 +28,7 @@
 Source1: konsole.desktop
 Source2: KDE.session.gnome
 Source3: kde.desktop
-Source4: kde-redhat-config-3.5-fc5-0.5.tar.bz2
+Source4: kde-redhat-config-3.6-fc5-1.tar.bz2
 Source5: kde-np
 Source6: logrotate-kdm
 Source7: mailsettings.cc
@@ -38,7 +38,7 @@
 Source11: cr48-app-package_games_kids.png
 
 Patch0: kdebase-3.5.5-redhat-pam.patch
-Patch1: kdebase-3.5.6-1-redhat-startkde.patch
+Patch1: kdebase-3.5.7-1-redhat-startkde.patch
 Patch2: kdebase-3.3.92-vroot.patch
 Patch3: kdebase-3.x-shortcuts.patch
 Patch4: kdebase-3.2.0-keymap.patch
@@ -55,7 +55,6 @@
 Patch20: kdebase-3.5.5-keyinit.patch
 Patch21: kdebase-3.5.3-khelpcenter-sort.patch
 Patch22: kdebase-3.5.4-htdig.patch
-Patch23: kdebase-3.5.4-antialias.patch
 Patch24: kdebase-3.5.4-tango-icon-theme.patch
 Patch25: kdebase-3.5.4-konqueror-shortcut.patch
 Patch26: kdebase-3.5.5-suspend.patch
@@ -174,7 +173,6 @@
 %patch20 -p1 -b .keyinit
 %patch21 -p1 -b .khelpcenter-sort
 %patch22 -p1 -b .htdig
-%patch23 -p1 -b .antialias
 %patch24 -p1 -b .tango-icon-theme
 %patch25 -p1 -b .konqueror-shortcut
 %patch26 -p1 -b .suspend
@@ -552,6 +550,9 @@
 %exclude %{_libdir}/libkdeinit_*.so
 
 %changelog
+* Tue Jun 05 2007 Than Ngo <than redhat com> - 6:3.5.7-0.1.fc6
+- 3.5.7
+
 * Wed Feb 14 2007 Than Ngo <than redhat com> - 6:3.5.6-0.2.fc6
 - make konsole binary sgid utempter #213369
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-6/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources	30 Jan 2007 13:31:24 -0000	1.76
+++ sources	5 Jun 2007 14:33:12 -0000	1.77
@@ -1,2 +1,2 @@
-61b60ed4ea41b30dfc18579cac48d20c  kde-redhat-config-3.5-fc5-0.5.tar.bz2
-a53f589f58012e655a52220a6a151019  kdebase-3.5.6.tar.bz2
+bda1b0de1fa68cbd39ae4658fffec2ea  kde-redhat-config-3.5-fc6-1.tar.bz2
+b421e01b3ee712549ee967f58ed24de0  kdebase-3.5.7.tar.bz2


--- kdebase-3.5.4-antialias.patch DELETED ---


--- kdebase-3.5.6-1-redhat-startkde.patch DELETED ---