SPECS: kdeaccessibility.spec - merged KDE 3.5.9 from AC-branch

[glen]

Author: glen                         Date: Sat Feb 16 00:11:41 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged KDE 3.5.9 from AC-branch

---- Files affected:
SPECS:
   kdeaccessibility.spec (1.73 -> 1.74) 

---- Diffs:

================================================================
Index: SPECS/kdeaccessibility.spec
diff -u SPECS/kdeaccessibility.spec:1.73 SPECS/kdeaccessibility.spec:1.74
--- SPECS/kdeaccessibility.spec:1.73	Sat Jan 19 15:32:25 2008
+++ SPECS/kdeaccessibility.spec	Sat Feb 16 01:11:36 2008
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-#
 # TODO:
 # - fix festival and speech_tools
 #
@@ -14,12 +13,12 @@
 Summary:	Accessibility support for KDE
 Summary(pl.UTF-8):	Ułatwienia dostępu dla KDE
 Name:		kdeaccessibility
-Version:	3.5.8
-Release:	1
+Version:	3.5.9
+Release:	2
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	0ede2d48df626aa436dbe6c741d575f1
+# Source0-md5:	79c7fa53ec60ad51fbdb16aac56d85a1
 URL:		http://www.kde.org/
 Patch0:		kde-common-PLD.patch
 Patch1:		kde-ac260-lt.patch
@@ -229,25 +228,33 @@
 %{__make}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
+	rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
+
+	%{__make} install \
+		DESTDIR=$RPM_BUILD_ROOT \
+		kde_htmldir=%{_kdedocdir}
+	touch makeinstall.stamp
+fi
+
+if [ ! -f installed.stamp ]; then
+	install -d $RPM_BUILD_ROOT%{_desktopdir}/kde
+	mv $RPM_BUILD_ROOT%{_datadir}/applnk/Applications/* $RPM_BUILD_ROOT%{_desktopdir}/kde
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	kde_htmldir=%{_kdedocdir}
+	rm -rf $RPM_BUILD_ROOT%{_iconsdir}/locolor
+	rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
 
-install -d $RPM_BUILD_ROOT%{_desktopdir}/kde
+	rm -f $RPM_BUILD_ROOT%{_libdir}/libKTTSD_Lib.so
+	rm -f $RPM_BUILD_ROOT%{_libdir}/libkttsd.so
 
-mv $RPM_BUILD_ROOT%{_datadir}/applnk/Applications/* \
-	$RPM_BUILD_ROOT%{_desktopdir}/kde
+	touch installed.stamp
+fi
 
 %find_lang kmag		--with-kde
 %find_lang kmousetool	--with-kde
 %find_lang kmouth	--with-kde
 %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
 
@@ -277,14 +284,14 @@
 %attr(755,root,root) %{_bindir}/kmag
 %{_datadir}/apps/kmag
 %{_desktopdir}/kde/kmag.desktop
-%{_iconsdir}/[!l]*/*/apps/kmag.*
+%{_iconsdir}/*/*/apps/kmag.*
 
 %files kmousetool -f kmousetool.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kmousetool
 %{_datadir}/apps/kmousetool
 %{_desktopdir}/kde/kmousetool.desktop
-%{_iconsdir}/[!l]*/*/apps/kmousetool.*
+%{_iconsdir}/*/*/apps/kmousetool.*
 
 %files kmouth -f kmouth.lang
 %defattr(644,root,root,755)
@@ -292,7 +299,7 @@
 %{_datadir}/apps/kmouth
 %{_datadir}/config/kmouthrc
 %{_desktopdir}/kde/kmouth.desktop
-%{_iconsdir}/[!l]*/*/apps/kmouth.*
+%{_iconsdir}/*/*/apps/kmouth.*
 
 %files ksayit
 %defattr(644,root,root,755)
@@ -321,7 +328,9 @@
 %attr(755,root,root) %{_libdir}/kde3/libkttsd_xmltransformerplugin.so
 %attr(755,root,root) %{_libdir}/kde3/libkttsjobmgrpart.so
 %attr(755,root,root) %{_libdir}/libKTTSD_Lib.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libKTTSD_Lib.so.0
 %attr(755,root,root) %{_libdir}/libkttsd.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkttsd.so.1
 %{_desktopdir}/kde/kcmkttsd.desktop
 %{_desktopdir}/kde/kttsmgr.desktop
 %{_datadir}/apps/ktexteditor_kttsd
@@ -349,6 +358,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74  2008-02-16 00:11:36  glen
+- merged KDE 3.5.9 from AC-branch
+
 Revision 1.73  2008-01-19 14:32:25  qboosh
 - bcond header
 
================================================================

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