rpms/kdebase-workspace/devel kdebase-workspace-4.0.1-redhat-startkde.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 kdebase-workspace.spec, 1.27, 1.28 sources, 1.6, 1.7 kdebase-workspace-4.0.0-kde#155122.patch, 1.1, NONE kdebase-workspace-4.0.0-redhat-startkde.patch, 1.1, NONE kdebase-workspace-4.0.0-systemtray.patch, 1.2, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Jan 31 12:58:36 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6903
Modified Files:
.cvsignore kdebase-workspace.spec sources
Added Files:
kdebase-workspace-4.0.1-redhat-startkde.patch
Removed Files:
kdebase-workspace-4.0.0-kde#155122.patch
kdebase-workspace-4.0.0-redhat-startkde.patch
kdebase-workspace-4.0.0-systemtray.patch
Log Message:
* Wed Jan 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-1
- 4.0.1
kdebase-workspace-4.0.1-redhat-startkde.patch:
--- NEW FILE kdebase-workspace-4.0.1-redhat-startkde.patch ---
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
-# 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 @@ fi
# 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 @@ kdeinit4_shutdown
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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 7 Jan 2008 23:21:47 -0000 1.5
+++ .cvsignore 31 Jan 2008 12:58:00 -0000 1.6
@@ -1 +1,2 @@
kdebase-workspace-4.0.0.tar.bz2
+kdebase-workspace-4.0.1.tar.bz2
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- kdebase-workspace.spec 30 Jan 2008 14:46:02 -0000 1.27
+++ kdebase-workspace.spec 31 Jan 2008 12:58:00 -0000 1.28
@@ -4,21 +4,17 @@
Summary: K Desktop Environment - Workspace
Name: kdebase-workspace
-Version: 4.0.0
+Version: 4.0.1
-Release: 8%{?dist}
+Release: 1%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{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.0-redhat-startkde.patch
+Patch1: kdebase-workspace-4.0.1-redhat-startkde.patch
Patch2: kdebase-workspace-4.0.0-consolekit-kdm.patch
-# http://bugs.kde.org/153193#c35,36
-Patch3: kdebase-workspace-4.0.0-systemtray.patch
-# http://bugzilla.redhat.com/428131, http://bugs.kde.org/155122
-Patch4: kdebase-workspace-4.0.0-kde#155122.patch
# http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu)
# backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=762886
Patch5: kdebase-workspace-4.0.0-kde#155362.patch
@@ -107,10 +103,8 @@
%patch1 -p1 -b .redhat-startkde
# ConsoleKit support for KDM (#228111, kde#147790)
%patch2 -p1 -b .consolekit
-#
-%patch3 -p1 -b .systemtray
-%patch4 -p4 -b .kde#155122
-%patch5 -p1 -b .kde#155362
+# FIXME: omitted for now, doesn't apply
+#patch5 -p1 -b .kde#155362
%build
@@ -222,6 +216,9 @@
%changelog
+* Wed Jan 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-1
+- 4.0.1
+
* Wed Jan 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.0-8
- respin (qt4)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 9 Jan 2008 00:08:40 -0000 1.6
+++ sources 31 Jan 2008 12:58:00 -0000 1.7
@@ -1 +1 @@
-f3d2155ff5ff7472a8884bd3f31bff16 kdebase-workspace-4.0.0.tar.bz2
+6ecb82891cfee668d1a2a2f7bce2b2e8 kdebase-workspace-4.0.1.tar.bz2
--- kdebase-workspace-4.0.0-kde#155122.patch DELETED ---
--- kdebase-workspace-4.0.0-redhat-startkde.patch DELETED ---
--- kdebase-workspace-4.0.0-systemtray.patch DELETED ---
More information about the fedora-extras-commits
mailing list