rpms/kdebase3/devel kdebase-3.1-startpage.patch, 1.1, 1.2 kdebase-3.5.9-redhat-startkde.patch, 1.1, 1.2 kdebase3.spec, 1.40, 1.41

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15863

Modified Files:
	kdebase-3.1-startpage.patch 
	kdebase-3.5.9-redhat-startkde.patch kdebase3.spec 
Log Message:
- fixup startkde patch, omitting broken bits, for now (#426871)
- update startpage patch, use http://start.fedoraproject.org/


kdebase-3.1-startpage.patch:

Index: kdebase-3.1-startpage.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase-3.1-startpage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.1-startpage.patch	1 Dec 2007 06:52:52 -0000	1.1
+++ kdebase-3.1-startpage.patch	14 Feb 2008 21:53:34 -0000	1.2
@@ -9,6 +9,6 @@
 -View0_URL=about:konqueror
 +View0_ServiceName=khtml
 +View0_ServiceType=text/html
-+View0_URL=file:/usr/share/doc/HTML/index.html
++View0_URL=http://start.fedoraproject.org/
  Width=80%
  Height=80%

kdebase-3.5.9-redhat-startkde.patch:

Index: kdebase-3.5.9-redhat-startkde.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase-3.5.9-redhat-startkde.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.9-redhat-startkde.patch	14 Feb 2008 21:35:10 -0000	1.1
+++ kdebase-3.5.9-redhat-startkde.patch	14 Feb 2008 21:53:34 -0000	1.2
@@ -1,61 +1,5 @@
 --- kdebase-3.5.7/startkde.redhat	2006-10-02 13:13:29.000000000 +0200
 +++ kdebase-3.5.7/startkde	2006-10-10 17:35:53.000000000 +0200
-@@ -1,7 +1,54 @@
- #!/bin/sh
- #
- #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.9 )
--#
-+#  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


Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kdebase3.spec	14 Feb 2008 21:35:10 -0000	1.40
+++ kdebase3.spec	14 Feb 2008 21:53:34 -0000	1.41
@@ -57,7 +57,7 @@
 Source1002: kde-legacy.pamd
 
 Patch0: kdebase-3.5.5-redhat-pam.patch
-Patch1: kdebase-%{version}-redhat-startkde.patch
+Patch1: kdebase-3.5.9-redhat-startkde.patch
 Patch2: kdebase-3.3.92-vroot.patch
 Patch3: kdebase-3.x-shortcuts.patch
 Patch4: kdebase-3.2.0-keymap.patch
@@ -83,7 +83,6 @@
 Patch29: kdebase-3.5.8-konsole-bz#244906.patch
 Patch30: kdebase-3.5.7-kio_media_mounthelper.patch
 Patch31: kdebase-3.5.7-konsolesu.patch
-Patch32: kdebase-3.5.8-flash.patch
 # fix check for struct ucred to work with current glibc 2.7.90
 Patch35: kdebase-3.5.8-glibc28-struct-ucred.patch
 
@@ -798,6 +797,8 @@
 %changelog
 * Thu Feb 14 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-1
 - kde-3.5.9
+- fixup startkde patch, omitting broken bits, for now (#426871)
+- update startpage patch, use http://start.fedoraproject.org/
 
 * Sat Feb 09 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.8-37
 - sync from F8: