SPECS: kdesdk.spec - rel 5; drop la files; fix build with new am

arekm arekm at pld-linux.org
Tue Jan 9 19:53:27 CET 2007


Author: arekm                        Date: Tue Jan  9 18:53:27 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 5; drop la files; fix build with new am

---- Files affected:
SPECS:
   kdesdk.spec (1.164 -> 1.165) 

---- Diffs:

================================================================
Index: SPECS/kdesdk.spec
diff -u SPECS/kdesdk.spec:1.164 SPECS/kdesdk.spec:1.165
--- SPECS/kdesdk.spec:1.164	Wed Nov 29 00:07:21 2006
+++ SPECS/kdesdk.spec	Tue Jan  9 19:53:22 2007
@@ -8,7 +8,7 @@
 Summary(pl):	KDESDK - Wsparcie programistyczne dla KDE
 Name:		kdesdk
 Version:	3.5.5
-Release:	4
+Release:	5
 Epoch:		3
 License:	GPL
 Group:		X11/Development/Tools
@@ -19,9 +19,14 @@
 Patch1:		%{name}-am.patch
 Patch2:		%{name}-kompare-encoding.patch
 Patch3:		kde-ac260-lt.patch
+Patch4:		kde-am.patch
 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
@@ -698,6 +703,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 #echo "KDE_OPTIONS = nofinal" >> cervisia/Makefile.am
 #echo "KDE_OPTIONS = nofinal" >> umbrello/umbrello/classparser/Makefile.am
@@ -813,6 +819,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
@@ -842,7 +851,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
@@ -853,7 +861,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
@@ -895,13 +902,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
 
@@ -914,13 +919,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
@@ -1012,11 +1013,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
@@ -1048,9 +1046,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
@@ -1064,8 +1060,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
@@ -1075,7 +1071,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)
@@ -1109,7 +1104,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
 
@@ -1211,8 +1205,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
@@ -1226,6 +1218,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.165  2007/01/09 18:53:22  arekm
+- rel 5; drop la files; fix build with new am
+
 Revision 1.164  2006/11/28 23:07:21  arekm
 - disable R: libtool() stuff
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdesdk.spec?r1=1.164&r2=1.165&f=u



More information about the pld-cvs-commit mailing list