rpms/kdelibs3/F-9 kdelibs-3.5.9-drkonqi-kde4.patch, NONE, 1.1 kdelibs3.spec, 1.29, 1.30

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Wed Jul 2 06:32:08 UTC 2008


Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs3/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10625/F-9

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.9-drkonqi-kde4.patch 
Log Message:
* Wed Jul 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-16
- f9+: use drkonqi from KDE 4 kdebase-runtime in KCrash (#453243)

kdelibs-3.5.9-drkonqi-kde4.patch:

--- NEW FILE kdelibs-3.5.9-drkonqi-kde4.patch ---
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


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/F-9/kdelibs3.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kdelibs3.spec	4 Jun 2008 21:45:39 -0000	1.29
+++ kdelibs3.spec	2 Jul 2008 06:31:21 -0000	1.30
@@ -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 @@
 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 @@
 %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 @@
 
 
 %changelog
+* Wed Jul 02 2008 Kevin Kofler <Kevin at 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 at tigcc.ticalc.org> 3.5.9-15
 - set include_crystalsvg to 1 everywhere
 - use Epoch 1 for crystalsvg-icon-theme, add Obsoletes




More information about the fedora-extras-commits mailing list