From 51d8ce052c62e38265e91c6868fd5381faff8f63 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Tue, 5 Jan 2010 09:20:56 +0000
Subject: [PATCH] =?UTF-8?q?Neue=20Konfiguration=20f=C3=BCr=20kde4=20-=20la?=
 =?UTF-8?q?ndet=20direkt=20in=20eigenem=20Konfig=20Package?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/Viitor_kdeconfig@4996 504e572c-2e33-0410-9681-be2bf7408885
---
 etc/X11/XModules/{kde3 => kde4} | 0
 etc/sysconfig/profile.d/kde     | 4 ++--
 tmp/postinstall                 | 9 +++++----
 tmp/postremove                  | 1 +
 4 files changed, 8 insertions(+), 6 deletions(-)
 rename etc/X11/XModules/{kde3 => kde4} (100%)

diff --git a/etc/X11/XModules/kde3 b/etc/X11/XModules/kde4
similarity index 100%
rename from etc/X11/XModules/kde3
rename to etc/X11/XModules/kde4
diff --git a/etc/sysconfig/profile.d/kde b/etc/sysconfig/profile.d/kde
index a3aa0ec..5752629 100644
--- a/etc/sysconfig/profile.d/kde
+++ b/etc/sysconfig/profile.d/kde
@@ -19,7 +19,7 @@
 #
 #
 
-# Begin /etc/profile.d/30-kde4.sh
+# Begin /etc/sysconfig/profile.d/kde
 if [ ! -d /tmp/${USER}-kde4 ]; then
 	mkdir /tmp/${USER}-kde
 fi
@@ -36,4 +36,4 @@ export QT_PLUGINS_DIR64=$KDEDIR/lib64/kde4/plugins:$QTDIR/lib64${QT_PLUGINS_DIR+
 
 export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}${PKG_CONFIG_PATH+:}${KDEDIR}/lib/pkgconfig"
 
-# End /etc/profile.d/30-kde4.sh
+# End /etc/sysconfig/profile.d/kde
diff --git a/tmp/postinstall b/tmp/postinstall
index afa073f..54c567f 100644
--- a/tmp/postinstall
+++ b/tmp/postinstall
@@ -71,12 +71,13 @@
 #
 
 #Korrektur der Begüßung im kdm
-sed -e "s/#GreetString=.*$/GreetString=\"Willkommen zu Viitor Linux auf %n\"/" \
-	/opt/kde/share/config/kdm/kdmrc >/tmp/kdmrc 
-mv /tmp/kdmrc /opt/kde/share/config/kdm/kdmrc
+sed -i -e "s/#GreetString=.*$/GreetString=\"Willkommen zu Viitor Linux auf %n\"/" \ /opt/kde/share/config/kdm/kdmrc 
+
+#Eintrag in dbus für kde
+sed -i "/<standard_session_servicedirs \/>/a\  <servicedir>/opt/kde/share/dbus-1/services</servicedir>" /etc/sysconfig/dbus-1/session.conf
 
 #/opt/kde/lib in ldconfig aufnehmen
 LIBINST=`grep "/opt/kde/lib" /etc/ld.so.conf`
 if [ ! "$LIBINST" ]; then
-	echo "/opt/kde/lib" >>/etc/ld.so.conf
+	echo "/opt/kde/lib64" >>/etc/ld.so.conf
 fi
diff --git a/tmp/postremove b/tmp/postremove
index d1c30b7..731c7d4 100644
--- a/tmp/postremove
+++ b/tmp/postremove
@@ -72,3 +72,4 @@
 
 sed -i -e "/\/opt\/kde\/lib/d" /etc/ld.so.conf
 sed -i -e "/\/opt\/kde\/lib64/d" /etc/ld.so.conf
+sed -i -e "/<servicedir>\/opt\/kde\/share\/dbus-1\/services/d" /etc/sysconfig/dbus-1/session.conf