rpms/kdebase-workspace/devel kdebase-workspace-4.0.1-redhat-startkde.patch, 1.1, 1.2 kdebase-workspace.spec, 1.34, 1.35

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdebase-workspace-4.0.1-redhat-startkde.patch 
	kdebase-workspace.spec 
Log Message:
* Sat Feb 16 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.1-7
- omit broken disk space checking hunk from redhat-startkde patch (#426871)

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

Index: kdebase-workspace-4.0.1-redhat-startkde.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.0.1-redhat-startkde.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.0.1-redhat-startkde.patch	31 Jan 2008 12:58:00 -0000	1.1
+++ kdebase-workspace-4.0.1-redhat-startkde.patch	16 Feb 2008 08:02:16 -0000	1.2
@@ -1,60 +1,6 @@
 diff -up kdebase-workspace-4.0.1/startkde.cmake.redhat-startkde kdebase-workspace-4.0.1/startkde.cmake
 --- kdebase-workspace-4.0.1/startkde.cmake.redhat-startkde	2008-01-30 17:52:07.000000000 -0600
 +++ kdebase-workspace-4.0.1/startkde.cmake	2008-01-30 21:20:31.000000000 -0600
-@@ -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 @@ if kcheckrunning >/dev/null 2>&1; then
  	exit 1
  fi


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- kdebase-workspace.spec	6 Feb 2008 17:44:52 -0000	1.34
+++ kdebase-workspace.spec	16 Feb 2008 08:02:16 -0000	1.35
@@ -6,7 +6,7 @@
 Name: kdebase-workspace
 Version: 4.0.1
 
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -220,6 +220,9 @@
 
 
 %changelog
+* Sat Feb 16 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.1-7
+- omit broken disk space checking hunk from redhat-startkde patch (#426871)
+
 * Wed Feb 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-6
 - revert Conflicts, it matches against Provides from kdelibs3.