SPECS (AC-branch): kdesdk.spec - merge with HEAD

[glen]

Author: glen                         Date: Thu Feb 14 22:43:17 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge with HEAD

---- Files affected:
SPECS:
   kdesdk.spec (1.163.2.8 -> 1.163.2.9) 

---- Diffs:

================================================================
Index: SPECS/kdesdk.spec
diff -u SPECS/kdesdk.spec:1.163.2.8 SPECS/kdesdk.spec:1.163.2.9
--- SPECS/kdesdk.spec:1.163.2.8	Thu Feb 14 23:05:12 2008
+++ SPECS/kdesdk.spec	Thu Feb 14 23:43:12 2008
@@ -22,7 +22,10 @@
 URL:		http://www.kde.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
+%ifarch %{x8664}
+# for kmtrace
 BuildRequires:	binutils-devel
+%endif
 BuildRequires:	bison
 BuildRequires:	db-devel
 BuildRequires:	emacs-common
@@ -814,6 +817,9 @@
 # unsupported
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/locolor
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*/*/*.la
+
 %find_lang	cervisia	--with-kde
 %find_lang	kbabel		--with-kde
 %find_lang	kcachegrind	--with-kde
@@ -843,7 +849,6 @@
 %files kfile
 %defattr(644,root,root,755)
 %doc README
-%{_libdir}/kde3/kfile_[!dp]*.la
 %attr(755,root,root) %{_libdir}/kde3/kfile_[!dp]*.so
 %{_datadir}/services/kfile_cpp.desktop
 %{_datadir}/services/kfile_h.desktop
@@ -854,7 +859,6 @@
 %attr(755,root,root) %{_bindir}/cervisia
 %attr(755,root,root) %{_bindir}/cvsaskpass
 %attr(755,root,root) %{_bindir}/cvsservice
-%{_libdir}/kde3/*cervisia*.la
 %attr(755,root,root) %{_libdir}/kde3/*cervisia*.so
 %attr(755,root,root) %{_libdir}/libkdeinit_cervisia.so
 %{_libdir}/libkdeinit_cervisia.la
@@ -896,13 +900,11 @@
 
 %files kde-resource-kdeaccounts
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kabcformat_kdeaccounts.la
 %attr(755,root,root) %{_libdir}/kde3/kabcformat_kdeaccounts.so
 %{_datadir}/apps/kabc/formats/*
 
 %files kde-resource-bugzilla
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kcal_bugzilla.la
 %attr(755,root,root) %{_libdir}/kde3/kcal_bugzilla.so
 %{_datadir}/services/kresources/kcal/bugzilla.desktop
 
@@ -915,13 +917,9 @@
 %attr(755,root,root) %{_libdir}/libkbabelcommon.so.*.*.*
 %{_libdir}/libkbabeldictplugin.la
 %attr(755,root,root) %{_libdir}/libkbabeldictplugin.so.*.*.*
-%{_libdir}/kde3/kbabel_*.la
 %attr(755,root,root) %{_libdir}/kde3/kbabel_*.so
-%{_libdir}/kde3/kbabeldict_*.la
 %attr(755,root,root) %{_libdir}/kde3/kbabeldict_*.so
-%{_libdir}/kde3/kfile_po.la
 %attr(755,root,root) %{_libdir}/kde3/kfile_po.so
-%{_libdir}/kde3/pothumbnail.la
 %attr(755,root,root) %{_libdir}/kde3/pothumbnail.so
 %{_datadir}/apps/catalogmanager
 %{_datadir}/apps/kbabel
@@ -1013,11 +1011,8 @@
 %{_libdir}/libkompareinterface.la
 %attr(755,root,root) %{_libdir}/libkompareinterface.so
 %attr(755,root,root) %{_libdir}/libkompareinterface.so.*.*.*
-%{_libdir}/kde3/kfile_diff.la
 %attr(755,root,root) %{_libdir}/kde3/kfile_diff.so
-%{_libdir}/kde3/libkomparenavtreepart.la
 %attr(755,root,root) %{_libdir}/kde3/libkomparenavtreepart.so
-%{_libdir}/kde3/libkomparepart.la
 %attr(755,root,root) %{_libdir}/kde3/libkomparepart.so
 %{_datadir}/apps/kompare*
 %{_datadir}/services/kfile_diff.desktop
@@ -1049,9 +1044,7 @@
 %files kuiviewer
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kuiviewer
-%{_libdir}/kde3/libkuiviewerpart.la
 %attr(755,root,root) %{_libdir}/kde3/libkuiviewerpart.so
-%{_libdir}/kde3/quithumbnail.la
 %attr(755,root,root) %{_libdir}/kde3/quithumbnail.so
 %dir %{_datadir}/apps/kuiviewer
 %{_datadir}/apps/kuiviewer/kuiviewerui.rc
@@ -1065,8 +1058,8 @@
 %files kunittest
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kunit*
-%attr(755,root,root) %{_libdir}/libkunit*.so.*.*.*
 %{_libdir}/libkunit*.la
+%attr(755,root,root) %{_libdir}/libkunit*.so.*.*.*
 %{_includedir}/kunittest
 
 %files libcvsservice
@@ -1076,7 +1069,6 @@
 %attr(755,root,root) %{_libdir}/libkdeinit_cvsservice.so
 %attr(755,root,root) %{_libdir}/libkdeinit_cvsaskpass.so
 %attr(755,root,root) %{_libdir}/kde3/cvs*.so
-%{_libdir}/kde3/cvs*.la
 
 %files libcvsservice-devel
 %defattr(644,root,root,755)
@@ -1110,7 +1102,6 @@
 
 %files scheck
 %defattr(644,root,root,755)
-%{_libdir}/kde3/plugins/styles/scheck.la
 %attr(755,root,root) %{_libdir}/kde3/plugins/styles/scheck.so
 %{_datadir}/apps/kstyle/themes/scheck.themerc
 
@@ -1212,8 +1203,6 @@
 %files -n kde-kio-svn
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*svn*
-%{_libdir}/kde3/kio_svn.la
-%{_libdir}/kde3/kded_ksvnd.la
 %attr(755,root,root) %{_libdir}/kde3/kio_svn.so
 %attr(755,root,root) %{_libdir}/kde3/kded_ksvnd.so
 %{_datadir}/services/kded/*svn*.desktop
@@ -1227,6 +1216,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.163.2.9  2008-02-14 22:43:12  glen
+- merge with HEAD
+
 Revision 1.163.2.8  2008-02-14 22:05:12  glen
 - convert to utf8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdesdk.spec?r1=1.163.2.8&r2=1.163.2.9&f=u