From dd96096ef148eeeadb44ed98133fea5baef34eb8 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Wed, 2 Jul 2008 06:31:38 +0000
Subject: [PATCH] - f9+: use drkonqi from KDE 4 kdebase-runtime in KCrash
 (#453243)

---
 kdelibs-3.5.9-drkonqi-kde4.patch | 21 +++++++++++++++++++++
 kdelibs3.spec                    | 10 +++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 kdelibs-3.5.9-drkonqi-kde4.patch

diff --git a/kdelibs-3.5.9-drkonqi-kde4.patch b/kdelibs-3.5.9-drkonqi-kde4.patch
new file mode 100644
index 0000000..5df229d
--- /dev/null
+++ b/kdelibs-3.5.9-drkonqi-kde4.patch
@@ -0,0 +1,21 @@
+diff -ur kdelibs-3.5.9/kdecore/kcrash.cpp kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp
+--- kdelibs-3.5.9/kdecore/kcrash.cpp	2007-01-15 12:34:17.000000000 +0100
++++ kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp	2008-07-02 08:24:37.000000000 +0200
+@@ -158,7 +158,7 @@
+           int i = 0;
+ 
+           // argument 0 has to be drkonqi
+-          argv[i++] = "drkonqi";
++          argv[i++] = "/usr/libexec/kde4/drkonqi";
+ 
+ #if defined Q_WS_X11
+           // start up on the correct display
+@@ -325,7 +325,7 @@
+       _exit(253);
+     if(!geteuid() && setuid(getuid()) < 0)
+       _exit(253);
+-    execvp("drkonqi", const_cast< char** >( argv ));
++    execv("/usr/libexec/kde4/drkonqi", const_cast< char** >( argv ));
+     _exit(errno);
+   }
+   else
diff --git a/kdelibs3.spec b/kdelibs3.spec
index c52f971..fd471da 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -29,7 +29,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.9
-Release: 15%{?dist}
+Release: 16%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -77,6 +77,8 @@ Patch50: kdelibs-3.5.8-kspell2-no-ispell.patch
 Patch51: kdelibs-3.5.9-cupsserverbin.patch
 # initial support for (Only|Not)ShowIn=KDE3
 Patch52: kdelibs-3.5.9-KDE3.patch
+# use /usr/libexec/kde4/drkonqi in KCrash (#453243)
+Patch53: kdelibs-3.5.9-drkonqi-kde4.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
@@ -256,6 +258,9 @@ format for easy browsing
 %endif
 %patch51 -p1 -b .cupsserverbin
 %patch52 -p1 -b .KDE3
+%if "%{name}" != "kdelibs"
+%patch53 -p1 -b .drkonqi-kde4
+%endif
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
@@ -615,6 +620,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 
 
 %changelog
+* Wed Jul 02 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-16
+- f9+: use drkonqi from KDE 4 kdebase-runtime in KCrash (#453243)
+
 * Wed Jun 04 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-15
 - set include_crystalsvg to 1 everywhere
 - use Epoch 1 for crystalsvg-icon-theme, add Obsoletes