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

[glen]

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

---- Files affected:
SPECS:
   kdeadmin.spec (1.162.2.7 -> 1.162.2.8) 

---- Diffs:

================================================================
Index: SPECS/kdeadmin.spec
diff -u SPECS/kdeadmin.spec:1.162.2.7 SPECS/kdeadmin.spec:1.162.2.8
--- SPECS/kdeadmin.spec:1.162.2.7	Thu Feb 14 23:03:28 2008
+++ SPECS/kdeadmin.spec	Thu Feb 14 23:03:52 2008
@@ -250,6 +250,7 @@
 	kde_htmldir=%{_kdedocdir}
 
 rm -rf $RPM_BUILD_ROOT%{_iconsdir}/locolor
+rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
 
 %find_lang kcron	--with-kde
 %find_lang kdat		--with-kde
@@ -265,7 +266,6 @@
 %ifarch %{ix86} %{x8664} sparc sparc64
 %files kcmlilo -f lilo-config.lang
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kcm_lilo.la
 %attr(755,root,root) %{_libdir}/kde3/kcm_lilo.so
 %{_desktopdir}/kde/lilo.desktop
 %endif
@@ -287,7 +287,6 @@
 %files kpackage -f kpackage.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kpackage
-%{_libdir}/kde3/kfile*.la
 %attr(755,root,root) %{_libdir}/kde3/kfile*.so
 %{_datadir}/apps/kpackage
 %{_datadir}/services/kfile*
@@ -315,7 +314,6 @@
 
 %files knetworkconf -f knetworkconf.lang
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kcm_knetworkconf*.la
 %attr(755,root,root) %{_libdir}/kde3/kcm_knetworkconf*.so
 %dir %{_datadir}/apps/knetworkconf
 %dir %{_datadir}/apps/knetworkconf/backends
@@ -334,6 +332,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.162.2.8  2008-02-14 22:03:52  glen
+- merge with HEAD
+
 Revision 1.162.2.7  2008-02-14 22:03:28  glen
 - convert to utf8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdeadmin.spec?r1=1.162.2.7&r2=1.162.2.8&f=u