rpms/kdesdk/devel kdesdk-3.5.4-multilib.patch, NONE, 1.1 kdesdk.spec, 1.60, 1.61

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdesdk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28902

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-3.5.4-multilib.patch 
Log Message:
fix multilib issue


kdesdk-3.5.4-multilib.patch:
 kminspector.in |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE kdesdk-3.5.4-multilib.patch ---
--- kdesdk-3.5.4/kmtrace/kminspector.in.orig	2006-09-05 17:22:52.000000000 +0200
+++ kdesdk-3.5.4/kmtrace/kminspector.in	2006-09-05 17:36:31.000000000 +0200
@@ -1,8 +1,11 @@
 #! /bin/sh
 
+kdeprefix=`kde-config --prefix`
+kdelibsuffix=`kde-config --libsuffix`
+
 export MALLOC_TREE=kminspector.tree
 export MALLOC_THRESHOLD=2000
-export LD_PRELOAD=@kde_libraries@/libktrace.so
+export LD_PRELOAD=${kdeprefix}/lib${kdelibsuffix}/libktrace.so
 
 $*
 


Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kdesdk.spec	5 Sep 2006 09:17:12 -0000	1.60
+++ kdesdk.spec	5 Sep 2006 15:53:16 -0000	1.61
@@ -23,6 +23,7 @@
 Patch1: kde-libtool.patch
 Patch2: kdesdk-3.4.0-db4.patch
 Patch3: kdesdk-3.4.92-misc.patch
+Patch4: kdesdk-3.5.4-multilib.patch
 
 # upstream patches
 Patch100: kdesdk-3.5.4-kde#131717.patch
@@ -59,6 +60,10 @@
 %patch1 -p1 -b .libtool
 %patch2 -p1 -b .db4
 %patch3 -p1 -b .misc
+%patch4 -p1 -b .multilib
+
+# upstream patches
+%patch100 -p0 -b .kde#131717
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
@@ -118,6 +123,8 @@
 done
 popd
 
+rm -f %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile
+
 %clean
 rm -rf %{buildroot}
 
@@ -160,6 +167,7 @@
 
 %changelog
 * Tue Sep 05 2006 Than Ngo <than at redhat.com> 3.5.4-2
+- fix #205217, multilib issue
 - apply upstream patches
     fix #131717, kompare won't parse diffs from git