rpms/kdesdk/FC-5 kdesdk-3.5.4-multilib.patch, NONE, 1.1 .cvsignore, 1.32, 1.33 kdesdk.spec, 1.55, 1.56 sources, 1.33, 1.34 kde-libtool.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: than

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

Modified Files:
	.cvsignore kdesdk.spec sources 
Added Files:
	kdesdk-3.5.4-multilib.patch 
Removed Files:
	kde-libtool.patch 
Log Message:
3.5.5


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: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-5/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	9 Jun 2006 17:15:10 -0000	1.32
+++ .cvsignore	24 Oct 2006 13:26:24 -0000	1.33
@@ -11,3 +11,4 @@
 kdesdk-3.5.1.tar.bz2
 kdesdk-3.5.2.tar.bz2
 kdesdk-3.5.3.tar.bz2
+kdesdk-3.5.5.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-5/kdesdk.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kdesdk.spec	14 Aug 2006 13:49:27 -0000	1.55
+++ kdesdk.spec	24 Oct 2006 13:26:24 -0000	1.56
@@ -11,7 +11,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Name: kdesdk
-Version: 3.5.4
+Version: 3.5.5
 Release: 0.1.fc5
 Summary: The KDE Software Development Kit (SDK)
 URL: http://www.kde.org/
@@ -19,9 +19,9 @@
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-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
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -36,6 +36,7 @@
 BuildRequires: db4-devel
 BuildRequires: desktop-file-utils
 BuildRequires: flex
+BuildRequires: binutils-devel
 
 %description
 A collection of applications and tools used by KDE developers.
@@ -54,9 +55,9 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .libtool
 %patch2 -p1 -b .db4
 %patch3 -p1 -b .misc
+%patch4 -p1 -b .multilib
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
@@ -113,6 +114,9 @@
 done
 popd
 
+rm -f %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile
+      %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile.in
+
 %clean
 rm -rf %{buildroot}
 
@@ -137,7 +141,8 @@
 %doc %{_docdir}/HTML/en/*
 %{_bindir}/*
 %{_libdir}/kde3/*
-%{_libdir}/*.so*
+%{_libdir}/*.so.*
+%{_libdir}/libkdeinit_*.so
 %{_libdir}/*.la
 %{_datadir}/apps/*
 %{_datadir}/mimelnk/application/*
@@ -150,10 +155,15 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/kde/*
+%{_libdir}/*.so
+%exclude %{_libdir}/libkdeinit_*.so
 %{_libdir}/*.a
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 24 2006 Than Ngo <than at redhat.com> 3.5.5-0.1.fc5
+- 3.5.5
+
 * Mon Aug 14 2006 Than Ngo <than at redhat.com> 3.5.4-0.1.fc5
 - 3.5.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-5/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	14 Aug 2006 13:49:27 -0000	1.33
+++ sources	24 Oct 2006 13:26:24 -0000	1.34
@@ -1 +1 @@
-2150e6a4ce5e42886a4afc6c0198c30c  kdesdk-3.5.4.tar.bz2
+d226bf07bf8106f37b4e9e31a7d451f0  kdesdk-3.5.5.tar.bz2


--- kde-libtool.patch DELETED ---