rpms/kdebase-workspace/devel kdebase-workspace-4.1.82-redhat-startkde.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 kdebase-workspace.spec, 1.147, 1.148 sources, 1.26, 1.27 kdebase-workspace-4.1.72-redhat-startkde.patch, 1.2, NONE

[Lorenzo Villani]

Author: arbiter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13687

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Added Files:
	kdebase-workspace-4.1.82-redhat-startkde.patch 
Removed Files:
	kdebase-workspace-4.1.72-redhat-startkde.patch 
Log Message:
- 4.1.82

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

--- NEW FILE kdebase-workspace-4.1.82-redhat-startkde.patch ---
diff -Naurw kdebase-workspace-4.1.82/startkde.cmake kdebase-workspace-4.1.82.redhat-startkde/startkde.cmake
--- kdebase-workspace-4.1.82/startkde.cmake	2008-11-28 16:33:30.000000000 +0100
+++ kdebase-workspace-4.1.82.redhat-startkde/startkde.cmake	2008-12-10 20:10:42.000000000 +0100
@@ -19,12 +19,12 @@
         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 "#103D77"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@@ -34,22 +34,6 @@
 MALLOC_CHECK_=2 
 export MALLOC_CHECK_
 
-# in case we have been started with full pathname spec without being in PATH
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-if [ -n "$bindir" ]; then
-  qbindir=`$bindir/kde4-config --qt-binaries`
-  if [ -n "$qbindir" ]; then
-    case $PATH in
-      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
-      *) PATH=$qbindir:$PATH; export PATH;;
-    esac
-  fi
-  case $PATH in
-    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-    *) PATH=$bindir:$PATH; export PATH;;
-  esac
-fi
-
 # Boot sequence:
 #
 # kdeinit is used to fork off processes which improves memory usage
@@ -87,6 +71,13 @@
 kcmfonts General forceFontDPI 0
 kdeglobals Locale Language '' # trigger requesting languages from KLocale
 EOF
+# read the default KSplash theme to use out of kde-settings
+if [ -e /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc ]
+  then eval `grep '^Theme=' /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc`
+       if [ -n "$Theme" ]
+         then sed -i -e "s/Default/$Theme/g" $kdehome/share/config/startupconfigkeys
+       fi
+fi
 kstartupconfig4
 returncode=$?
 if test $returncode -ne 0; then
@@ -207,8 +198,9 @@
 # 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
@@ -421,7 +413,8 @@
 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	19 Nov 2008 23:06:46 -0000	1.21
+++ .cvsignore	10 Dec 2008 19:50:20 -0000	1.22
@@ -1,2 +1 @@
-kdebase-workspace-4.1.2.tar.bz2
-kdebase-workspace-4.1.80.tar.bz2
+kdebase-workspace-4.1.82.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- kdebase-workspace.spec	5 Dec 2008 02:01:37 -0000	1.147
+++ kdebase-workspace.spec	10 Dec 2008 19:50:20 -0000	1.148
@@ -2,16 +2,16 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.1.80
+Version: 4.1.82
 
-Release: 12%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{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.1.72-redhat-startkde.patch
+Patch1: kdebase-workspace-4.1.82-redhat-startkde.patch
 Patch2: kdebase-workspace-4.1.72-plasma-konsole.patch
 Patch3: kdebase-workspace-4.1.80-show-systemsettings.patch
 Patch4: kdebase-workspace-4.0.72-ck-shutdown.patch
@@ -284,6 +284,10 @@
 
 
 %changelog
+* Wed Dec 10 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.82-1
+- 4.1.82
+- rebase redhat-startkde patch
+
 * Fri Dec 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-12
 - move libplasma_applet-system-monitor.so from -devel to -libs (not a symlink)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	25 Nov 2008 15:23:47 -0000	1.26
+++ sources	10 Dec 2008 19:50:20 -0000	1.27
@@ -1 +1 @@
-404a67541864085fbb6585afab7b95d2  kdebase-workspace-4.1.80.tar.bz2
+7861e031cc03e2fea65134e684eeda4b  kdebase-workspace-4.1.82.tar.bz2


--- kdebase-workspace-4.1.72-redhat-startkde.patch DELETED ---