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

[glen]

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

---- Files affected:
SPECS:
   kdeaccessibility.spec (1.61.2.6 -> 1.61.2.7) 

---- Diffs:

================================================================
Index: SPECS/kdeaccessibility.spec
diff -u SPECS/kdeaccessibility.spec:1.61.2.6 SPECS/kdeaccessibility.spec:1.61.2.7
--- SPECS/kdeaccessibility.spec:1.61.2.6	Fri Feb 15 00:00:20 2008
+++ SPECS/kdeaccessibility.spec	Fri Feb 15 00:02:42 2008
@@ -2,8 +2,10 @@
 #
 # TODO:
 # - fix festival and speech_tools
-
-%bcond_with	gstreamer	# needs gstreamer-plugins-devel 0.8
+#
+# Conditional build:
+%bcond_with	gstreamer	# gstreamer support (needs gstreamer-plugins-devel 0.8)
+#
 
 %define		_state		stable
 %define		_minlibsevr	9:%{version}
@@ -242,6 +244,7 @@
 %find_lang kttsd	--with-kde
 
 rm -rf $RPM_BUILD_ROOT%{_iconsdir}/locolor
+rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -252,6 +255,7 @@
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/ksayit_fxplugin.h
+%{_libdir}/*.la
 
 %files -n kde-icons-mono
 %defattr(644,root,root,755)
@@ -262,7 +266,6 @@
 
 %files kbstateapplet
 %defattr(644,root,root,755)
-%{_libdir}/kde3/kbstate_panelapplet.la
 %attr(755,root,root) %{_libdir}/kde3/kbstate_panelapplet.so
 %{_datadir}/apps/kbstateapplet
 %{_datadir}/apps/kicker/applets/kbstateapplet.desktop
@@ -300,39 +303,22 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kttsd
 %attr(755,root,root) %{_bindir}/kttsmgr
-%{_libdir}/kde3/kcm_kttsd.la
 %attr(755,root,root) %{_libdir}/kde3/kcm_kttsd.so
-%{_libdir}/kde3/ktexteditor_kttsd.la
 %attr(755,root,root) %{_libdir}/kde3/ktexteditor_kttsd.so
-%{_libdir}/kde3/libkttsd_alsaplugin.la
 %attr(755,root,root) %{_libdir}/kde3/libkttsd_alsaplugin.so
-%{_libdir}/kde3/libkttsd_artsplugin.la
 %attr(755,root,root) %{_libdir}/kde3/libkttsd_artsplugin.so
-%{_libdir}/kde3/libkttsd_commandplugin.la
 %attr(755,root,root) %{_libdir}/kde3/libkttsd_commandplugin.so
-%{_libdir}/kde3/libkttsd_eposplugin.la
 %attr(755,root,root) %{_libdir}/kde3/libkttsd_eposplugin.so
-%{_libdir}/kde3/libkttsd_festivalintplugin.la
 %attr(755,root,root) %{_libdir}/kde3/libkttsd_festivalintplugin.so
-%{_libdir}/kde3/libkttsd_fliteplugin.la
 %attr(755,root,root) %{_libdir}/kde3/libkttsd_fliteplugin.so
-%{_libdir}/kde3/libkttsd_freettsplugin.la
 %attr(755,root,root) %{_libdir}/kde3/libkttsd_freettsplugin.so
-%{_libdir}/kde3/libkttsd_hadifixplugin.la
 %attr(755,root,root) %{_libdir}/kde3/libkttsd_hadifixplugin.so
-%{_libdir}/kde3/libkttsd_sbdplugin.la
 %attr(755,root,root) %{_libdir}/kde3/libkttsd_sbdplugin.so
-%{_libdir}/kde3/libkttsd_stringreplacerplugin.la
 %attr(755,root,root) %{_libdir}/kde3/libkttsd_stringreplacerplugin.so
-%{_libdir}/kde3/libkttsd_talkerchooserplugin.la
 %attr(755,root,root) %{_libdir}/kde3/libkttsd_talkerchooserplugin.so
-%{_libdir}/kde3/libkttsd_xmltransformerplugin.la
 %attr(755,root,root) %{_libdir}/kde3/libkttsd_xmltransformerplugin.so
-%{_libdir}/kde3/libkttsjobmgrpart.la
 %attr(755,root,root) %{_libdir}/kde3/libkttsjobmgrpart.so
-%{_libdir}/libKTTSD_Lib.la
 %attr(755,root,root) %{_libdir}/libKTTSD_Lib.so.*.*.*
-%{_libdir}/libkttsd.la
 %attr(755,root,root) %{_libdir}/libkttsd.so.*.*.*
 %{_desktopdir}/kde/kcmkttsd.desktop
 %{_desktopdir}/kde/kttsmgr.desktop
@@ -347,13 +333,11 @@
 
 %files kttsd-akode
 %defattr(644,root,root,755)
-%{_libdir}/kde3/libkttsd_akodeplugin.la
 %attr(755,root,root) %{_libdir}/kde3/libkttsd_akodeplugin.so
 
 %if %{with gstreamer}
 %files kttsd-gstreamer
 %defattr(644,root,root,755)
-%{_libdir}/kde3/libkttsd_gstplugin.la
 %attr(755,root,root) %{_libdir}/kde3/libkttsd_gstplugin.so
 %endif
 
@@ -363,6 +347,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61.2.7  2008-02-14 23:02:42  glen
+- merge with HEAD
+
 Revision 1.61.2.6  2008-02-14 23:00:20  glen
 - convert to utf8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdeaccessibility.spec?r1=1.61.2.6&r2=1.61.2.7&f=u