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

[glen]

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

---- Files affected:
SPECS:
   kdeartwork.spec (1.112.2.6 -> 1.112.2.7) 

---- Diffs:

================================================================
Index: SPECS/kdeartwork.spec
diff -u SPECS/kdeartwork.spec:1.112.2.6 SPECS/kdeartwork.spec:1.112.2.7
--- SPECS/kdeartwork.spec:1.112.2.6	Thu Feb 14 22:57:54 2008
+++ SPECS/kdeartwork.spec	Thu Feb 14 23:00:11 2008
@@ -32,8 +32,6 @@
 BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define 	_noautoreqdep	libGL.so.1 libGLU.so.1
-
 %description
 This package contains various graphics and such for KDE.
 
@@ -407,68 +405,59 @@
 install kscreensaver/kxsconfig/ScreenSavers/*.desktop $RPM_BUILD_ROOT%{_datadir}/apps/kscreensaver
 rm -f $RPM_BUILD_ROOT%{_datadir}/apps/kscreensaver/pixmaps.desktop
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*/*/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -n kde-decoration-cde
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kwin3_cde.la
 %attr(755,root,root) %{_libdir}/kde3/kwin3_cde.so
-%{_libdir}/kde3/kwin_cde_config.la
 %attr(755,root,root) %{_libdir}/kde3/kwin_cde_config.so
 %{_datadir}/apps/kwin/cde.desktop
 
 %files -n kde-decoration-icewm
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kwin3_icewm.la
 %attr(755,root,root) %{_libdir}/kde3/kwin3_icewm.so
-%{_libdir}/kde3/kwin_icewm_config.la
 %attr(755,root,root) %{_libdir}/kde3/kwin_icewm_config.so
 %{_datadir}/apps/kwin/icewm-themes
 %{_datadir}/apps/kwin/icewm.desktop
 
 %files -n kde-decoration-glow
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kwin3_glow.la
 %attr(755,root,root) %{_libdir}/kde3/kwin3_glow.so
-%{_libdir}/kde3/kwin_glow_config.la
 %attr(755,root,root) %{_libdir}/kde3/kwin_glow_config.so
 %{_datadir}/apps/kwin/glow-themes
 %{_datadir}/apps/kwin/glow.desktop
 
 %files -n kde-decoration-kde1
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kwin3_kde1.la
 %attr(755,root,root) %{_libdir}/kde3/kwin3_kde1.so
 %{_datadir}/apps/kwin/kde1*
 
 %files -n kde-decoration-kstep
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kwin3_kstep.la
 %attr(755,root,root) %{_libdir}/kde3/kwin3_kstep.so
 %{_datadir}/apps/kwin/kstep*
 
 %files -n kde-decoration-openlook
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kwin3_openlook.la
 %attr(755,root,root) %{_libdir}/kde3/kwin3_openlook.so
 %{_datadir}/apps/kwin/openlook.desktop
 
 %files -n kde-decoration-riscos
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kwin3_riscos.la
 %attr(755,root,root) %{_libdir}/kde3/kwin3_riscos.so
 %{_datadir}/apps/kwin/riscos*
 
 %files -n kde-decoration-system
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kwin3_system.la
 %attr(755,root,root) %{_libdir}/kde3/kwin3_system.so
 %{_datadir}/apps/kwin/system.desktop
 
 %files -n kde-decoration-smoothblend
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kwin*_smoothblend*.la
 %attr(755,root,root) %{_libdir}/kde3/kwin*_smoothblend*.so
 %{_datadir}/apps/kwin/smoothblend.desktop
 
@@ -502,15 +491,12 @@
 
 %files -n kde-style-dotnet
 %defattr(644,root,root,755)
-%{_libdir}/kde3/plugins/styles/dotnet.la
 %attr(755,root,root) %{_libdir}/kde3/plugins/styles/dotnet.so
 %{_datadir}/apps/kstyle/themes/dotnet*
 
 %files -n kde-style-phase
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kstyle_phase_config.la
 %attr(755,root,root) %{_libdir}/kde3/kstyle_phase_config.so
-%{_libdir}/kde3/plugins/styles/phasestyle.la
 %attr(755,root,root) %{_libdir}/kde3/plugins/styles/phasestyle.so
 %{_datadir}/apps/kstyle/themes/phase.themerc
 
@@ -546,6 +532,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.112.2.7  2008-02-14 22:00:11  glen
+- merge with HEAD
+
 Revision 1.112.2.6  2008-02-14 21:57:54  glen
 - convert to utf8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdeartwork.spec?r1=1.112.2.6&r2=1.112.2.7&f=u