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

[glen]

Author: glen                         Date: Thu Feb 14 23:20:44 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge with HEAD

---- Files affected:
SPECS:
   kdevelop.spec (1.114.2.10 -> 1.114.2.11) 

---- Diffs:

================================================================
Index: SPECS/kdevelop.spec
diff -u SPECS/kdevelop.spec:1.114.2.10 SPECS/kdevelop.spec:1.114.2.11
--- SPECS/kdevelop.spec:1.114.2.10	Fri Feb 15 00:19:38 2008
+++ SPECS/kdevelop.spec	Fri Feb 15 00:20:38 2008
@@ -19,7 +19,7 @@
 Epoch:		7
 License:	GPL
 Group:		X11/Development/Tools
-Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{_kdever}/src/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{name}-%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5:	1101077b3a0164da463f60cad4f13e25
 Patch0:		kde-common-PLD.patch
 Patch1:		%{name}-am.patch
@@ -152,6 +152,8 @@
 mv {lo,hi}color/16x16/actions/kdevelop_tip.png
 mv {lo,hi}color/32x32/actions/kdevelop_tip.png
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -161,10 +163,8 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
-%{_libdir}/*.la
 %attr(755,root,root) %{_libdir}/*.so
 %attr(755,root,root) %{_libdir}/*.so.*.*.*
-%{_libdir}/kde3/*.la
 %attr(755,root,root) %{_libdir}/kde3/*.so*
 %{_libdir}/kconf_update_bin/kdev-gen-settings-kconf_update
 %{_datadir}/apps/*
@@ -185,6 +185,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.114.2.11  2008-02-14 23:20:38  glen
+- merge with HEAD
+
 Revision 1.114.2.10  2008-02-14 23:19:38  glen
 - convert to utf8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdevelop.spec?r1=1.114.2.10&r2=1.114.2.11&f=u