rpms/kdebase/devel kdebase-4.2.0-konsole_kdeinit.patch, NONE, 1.1 kdebase.spec, 1.356, 1.357

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.2.0-konsole_kdeinit.patch 
Log Message:
* Wed Jan 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
- KDEInit could not launch '/usr/bin/konsole' (kdebug#162729)


kdebase-4.2.0-konsole_kdeinit.patch:

--- NEW FILE kdebase-4.2.0-konsole_kdeinit.patch ---
diff -up kdebase-4.2.0/apps/konsole/desktop/konsole.desktop.kdeinit kdebase-4.2.0/apps/konsole/desktop/konsole.desktop
--- kdebase-4.2.0/apps/konsole/desktop/konsole.desktop.kdeinit	2009-01-17 04:59:32.000000000 -0600
+++ kdebase-4.2.0/apps/konsole/desktop/konsole.desktop	2009-01-28 15:09:35.000000000 -0600
@@ -92,5 +92,6 @@ GenericName[x-test]=xxTerminalxx
 GenericName[zh_CN]=终端
 GenericName[zh_TW]=終端機
 X-DBUS-StartupType=Unique
+X-DBUS-ServiceName=org.kde.konsole
 X-KDE-AuthorizeAction=shell_access
 Categories=Qt;KDE;System;TerminalEmulator;


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- kdebase.spec	22 Jan 2009 10:15:06 -0000	1.356
+++ kdebase.spec	28 Jan 2009 21:34:03 -0000	1.357
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -30,6 +30,8 @@
 Patch1:   kdebase-4.1.70-konsole-session.patch
 
 ## upstream patches
+# bugs.kde.org/162729
+Patch100: kdebase-4.2.0-konsole_kdeinit.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -125,9 +127,12 @@
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 
+%patch100 -p1 -b .konsole_kdeinit
+
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
 
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -304,6 +309,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- KDEInit could not launch '/usr/bin/konsole' (kdebug#162729)
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0