rpms/kdebase/devel kdebase-3.5.2-1-redhat.patch, NONE, 1.1 kdebase.spec, 1.162, 1.163 kdebase-3.5.2-redhat.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 13 08:18:09 UTC 2006
- Previous message (by thread): rpms/net-tools/devel net-tools.spec,1.64,1.65
- Next message (by thread): rpms/udev/devel udev-089-last_modalias.patch, NONE, 1.1 udev-089-nopie.patch, NONE, 1.1 udev-089.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.32, 1.33 sources, 1.32, 1.33 start_udev, 1.51, 1.52 udev-rules.patch, 1.11, 1.12 udev.spec, 1.162, 1.163 upstream, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: than
Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5312
Modified Files:
kdebase.spec
Added Files:
kdebase-3.5.2-1-redhat.patch
Removed Files:
kdebase-3.5.2-redhat.patch
Log Message:
fix startkde to look in /usr and /etc/kde for env/ and shutdown/
kdebase-3.5.2-1-redhat.patch:
kdebase-3.4.91/kde.pamd | 16 +++++++----
kdebase-3.5.1/startkde | 68 +++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 69 insertions(+), 15 deletions(-)
--- NEW FILE kdebase-3.5.2-1-redhat.patch ---
--- kdebase-3.4.91/kde.pamd.redhat 2005-09-10 10:26:16.000000000 +0200
+++ kdebase-3.4.91/kde.pamd 2005-09-27 18:16:15.000000000 +0200
@@ -1,7 +1,11 @@
#%PAM-1.0
-auth required /lib/security/pam_pwdb.so shadow nullok
-auth required /lib/security/pam_nologin.so
-account required /lib/security/pam_pwdb.so
-password required /lib/security/pam_cracklib.so
-password required /lib/security/pam_pwdb.so shadow nullok use_authtok
-session required /lib/security/pam_pwdb.so
+auth sufficient pam_timestamp.so
+auth include system-auth
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session include system-auth
+session required pam_loginuid.so
+session optional pam_timestamp.so
+session optional pam_selinux.so
+session optional pam_console.so
--- kdebase-3.5.1/startkde.redhat 2006-01-19 18:03:19.000000000 +0100
+++ kdebase-3.5.1/startkde 2006-02-15 18:58:10.000000000 +0100
@@ -1,8 +1,56 @@
#!/bin/sh
#
# DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.2 )
+# 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=`df /tmp | xargs | cut -d" " -f11`
+homedir_mount=`df "$HOME" | xargs | cut -d" " -f8`
+
+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
+ # check for AFS
+ space_home=`fs df "$HOME" | xargs | cut -d" " -f10`
+else
+ # check regular mounts
+ space_home=`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.
trap 'echo GOT SIGHUP' HUP
@@ -14,12 +62,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
@@ -64,7 +112,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]
@@ -135,8 +183,8 @@
done
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`
@@ -147,10 +195,11 @@
# For anything else (that doesn't set env vars, or that needs a window manager),
# better use the Autostart folder.
-exepath=`kde-config --path exe | tr : '\n'`
+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
@@ -339,7 +388,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: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- kdebase.spec 3 Apr 2006 21:45:35 -0000 1.162
+++ kdebase.spec 13 Apr 2006 08:18:07 -0000 1.163
@@ -20,7 +20,7 @@
Summary: K Desktop Environment - core files
Name: kdebase
Version: 3.5.2
-Release: 2
+Release: 3
Epoch: 6
Url: http://www.kde.org
Group: User Interface/Desktops
@@ -37,7 +37,7 @@
Source7: mailsettings.cc
Patch0: kde-libtool.patch
-Patch1: kdebase-3.5.2-redhat.patch
+Patch1: kdebase-3.5.2-1-redhat.patch
Patch2: kdebase-3.3.92-vroot.patch
Patch3: kdebase-3.x-shortcuts.patch
Patch4: kdebase-3.2.0-keymap.patch
@@ -422,6 +422,9 @@
%{_includedir}/kde/ksplash/*
%changelog
+* Thu Apr 13 2006 Than Ngo <than at redhat.com> 6:3.5.2-3
+- fix startkde to look in /usr and /etc/kde for env/ and shutdown/
+
* Mon Apr 03 2006 Than Ngo <than at redhat.com> 6:3.5.2-2
- update dbus patch
--- kdebase-3.5.2-redhat.patch DELETED ---
- Previous message (by thread): rpms/net-tools/devel net-tools.spec,1.64,1.65
- Next message (by thread): rpms/udev/devel udev-089-last_modalias.patch, NONE, 1.1 udev-089-nopie.patch, NONE, 1.1 udev-089.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.32, 1.33 sources, 1.32, 1.33 start_udev, 1.51, 1.52 udev-rules.patch, 1.11, 1.12 udev.spec, 1.162, 1.163 upstream, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list