rpms/kdebase/devel kdebase-3.91.0-redhat-startkde.patch, NONE, 1.1.2.1 kde4-xdg_menu_prefix.sh, 1.1.2.1, 1.1.2.2 kdebase.spec, 1.263.2.2, 1.263.2.3
Than Ngo (than)
fedora-extras-commits at redhat.com
Wed Jul 25 16:43:03 UTC 2007
Author: than
Update of /cvs/extras/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30130
Modified Files:
Tag: kdebase-kde4-branch
kde4-xdg_menu_prefix.sh kdebase.spec
Added Files:
Tag: kdebase-kde4-branch
kdebase-3.91.0-redhat-startkde.patch
Log Message:
- fix startkde
- add env/shutdown directory
kdebase-3.91.0-redhat-startkde.patch:
--- NEW FILE kdebase-3.91.0-redhat-startkde.patch ---
--- kdebase-3.91.0/workspace/startkde.orig 2007-07-25 17:18:06.000000000 +0200
+++ kdebase-3.91.0/workspace/startkde 2007-07-25 17:35:32.000000000 +0200
@@ -2,6 +2,53 @@
#
# DEFAULT KDE STARTUP SCRIPT ( KDE-3.91 )
#
+# 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
@@ -180,9 +227,10 @@ fi
# better use the Autostart folder.
exepath=`kde4-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
@@ -370,7 +418,8 @@ kdeinit4_shutdown
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: kde4-xdg_menu_prefix.sh
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/Attic/kde4-xdg_menu_prefix.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- kde4-xdg_menu_prefix.sh 24 Jul 2007 23:32:37 -0000 1.1.2.1
+++ kde4-xdg_menu_prefix.sh 25 Jul 2007 16:42:26 -0000 1.1.2.2
@@ -8,7 +8,7 @@
## XDG_MENU_PREFIX
if [ -z "${XDG_MENU_PREFIX}" ] ; then
- XDG_MENU_PREFIX="kde4-"
+ XDG_MENU_PREFIX="kde-"
export XDG_MENU_PREFIX
fi
Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.2
retrieving revision 1.263.2.3
diff -u -r1.263.2.2 -r1.263.2.3
--- kdebase.spec 24 Jul 2007 23:32:37 -0000 1.263.2.2
+++ kdebase.spec 25 Jul 2007 16:42:26 -0000 1.263.2.3
@@ -1,5 +1,3 @@
-
-
%if 0%{?fedora} > 7
Name: kdebase
Epoch: 6
@@ -13,7 +11,7 @@
%endif
Version: 3.91.0
-Release: 5%{?dist}%{?kde}
+Release: 6%{?dist}%{?kde}
Summary: K Desktop Environment 4 - Core Files
License: GPL
@@ -34,7 +32,8 @@
%endif
# use ~/.kde4 instead of ~/.kde
-Patch0: kdebase-%{version}-kde4home.diff
+Patch0: kdebase-%{version}-kde4home.diff
+Patch1: kdebase-3.91.0-redhat-startkde.patch
Requires(post): /sbin/ldconfig xdg-utils
Requires(postun): /sbin/ldconfig xdg-utils
@@ -113,7 +112,7 @@
%if "%{_prefix}" != "/usr"
%patch0 -p1 -b .kde4home
%endif
-
+%patch1 -p1 -b .redhat-startkde
%build
@@ -137,19 +136,18 @@
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}
-## ENV/SHUTDOWN
-# until startkde is patched to search/use %{_sysconfdir}/kde/{env,shutdown}
-install -d %{buildroot}%{_prefix}/{env,shutdown}
-install -D -m644 -p %{SOURCE1} %{buildroot}%{_prefix}/env/
+install -d %{buildroot}%{_sysconfdir}/kde/{env,shutdown}
+install -D -m644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/kde/env/
%if "%{_prefix}" == "/usr"
-install -D -m644 -p %{SOURCE2} %{buildroot}%{_prefix}/env/
+install -D -m644 -p %{SOURCE2} %{buildroot}%{_sysconfdir}/kde/env/
%endif
+
sed -i \
-e "s|@@PREFIX@@|%{_prefix}|" \
-e "s|@@BINDIR@@|%{_bindir}|" \
-e "s|@@LIBDIR@@|%{_libdir}|" \
-e "s|@@SYSCONFDIR@@|%_sysconfdir}|" \
- %{buildroot}%{_prefix}/env/*.sh
+ %{buildroot}%{_sysconfdir}/kde/env/*.sh
mkdir -p %{buildroot}/usr/share/xsessions
## kde->kde4 xsession
@@ -163,6 +161,9 @@
%endif
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown}
+install -p -m755 %{SOURCE8} %{buildroot}/etc/kde/env/
+
%clean
rm -rf %{buildroot}
@@ -187,12 +188,10 @@
%if "%{_prefix}" != "/usr"
%dir %{_datadir}/desktop-directories
%dir %{_libdir}/kconf_update_bin
-%dir %{_prefix}/env
-%dir %{_prefix}/shutdown
%endif
/usr/share/xsessions/*.desktop
-%{_prefix}/env/*
-#{_prefix}/shutdown/*
+%{_sysconfdir}/kde/env/*
+%{_sysconfdir}/kde/shutdown/*
%{_bindir}/*
%{_datadir}/applications/kde4/*
%{_datadir}/apps/*
@@ -229,6 +228,10 @@
%changelog
+* Wed Jul 25 2007 Than Ngo <than at redhat.com> - 3.91.0-6
+- fix startkde
+- add env/shutdown directory
+
* Thu Jul 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-5
- kde4.desktop: fix session Name
More information about the scm-commits
mailing list