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

[glen]

Author: glen                         Date: Fri Feb 15 23:55:03 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged KDE 3.5.9 from AC-branch

---- Files affected:
SPECS:
   kdegames.spec (1.175 -> 1.176) 

---- Diffs:

================================================================
Index: SPECS/kdegames.spec
diff -u SPECS/kdegames.spec:1.175 SPECS/kdegames.spec:1.176
--- SPECS/kdegames.spec:1.175	Tue Oct  9 15:31:58 2007
+++ SPECS/kdegames.spec	Sat Feb 16 00:54:57 2008
@@ -16,13 +16,13 @@
 Summary(pt_BR.UTF-8):	K Desktop Environment - Jogos
 Summary(zh_CN.UTF-8):	KDE游戏
 Name:		kdegames
-Version:	3.5.8
-Release:	1
+Version:	3.5.9
+Release:	2
 Epoch:		8
 License:	GPL
 Group:		X11/Applications/Games
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	786ee4e47820d92aef7db73424b9604c
+# Source0-md5:	472385f21a692270fb5643d7617c7ff3
 Patch0:		kde-common-PLD.patch
 Patch1:		kde-ac260-lt.patch
 Patch2:		%{name}-bashism.patch
@@ -773,19 +773,30 @@
 %{?with_apidocs:%{__make} apidox}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-rm -f *.lang
-
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	kde_htmldir=%{_kdedocdir}
+if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
+	rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/var/games
-touch $RPM_BUILD_ROOT/var/games/kbounce.scores
-
-%if %{with highscore}
-touch $RPM_BUILD_ROOT/var/games/k{fouleggs,lickety,mines,netwalk,reversi,sirtet}.scores
-%endif
+	%{__make} install \
+		DESTDIR=$RPM_BUILD_ROOT \
+		kde_htmldir=%{_kdedocdir}
+
+	touch makeinstall.stamp
+fi
+
+if [ ! -f installed.stamp ]; then
+	install -d $RPM_BUILD_ROOT/var/games
+	touch $RPM_BUILD_ROOT/var/games/kbounce.scores
+
+	%if %{with highscore}
+	touch $RPM_BUILD_ROOT/var/games/k{fouleggs,lickety,mines,netwalk,reversi,sirtet}.scores
+	%endif
+
+	# unsupported
+	rm -rf $RPM_BUILD_ROOT%{_iconsdir}/locolor
+
+	rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+	rm -f $RPM_BUILD_ROOT%{_libdir}/libkdeinit_kolf.la
+fi
 
 %find_lang atlantik	--with-kde
 %find_lang kasteroids	--with-kde
@@ -820,9 +831,7 @@
 %find_lang lskat	--with-kde
 
 # Omit apidocs entries
-sed -i 's/.*apidocs.*//' *.lang
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+%{__sed} -i -e '/apidocs/d' *.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -840,6 +849,7 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README README.highscore
 %attr(755,root,root) %{_libdir}/libkdegames.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdegames.so.1
 %{_datadir}/apps/kdegames
 %{_iconsdir}/*/*/actions/endturn.png
 %{_iconsdir}/*/*/*/highscore.png
@@ -873,7 +883,9 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/atlantik
 %attr(755,root,root) %{_libdir}/libatlantic.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libatlantic.so.1
 %attr(755,root,root) %{_libdir}/libatlantikclient.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libatlantikclient.so.1
 %attr(755,root,root) %{_libdir}/libatlantikui.so.*
 %attr(755,root,root) %{_libdir}/kde3/kio_atlantik.so
 %{_datadir}/apps/atlantik
@@ -928,7 +940,7 @@
 %attr(660,root,games) %config(noreplace) %verify(not md5 mtime size) /var/games/kbounce.scores
 %{_datadir}/apps/kbounce
 %{_desktopdir}/kde/kbounce.desktop
-%{_iconsdir}/[!l]*/*/*/kbounce*
+%{_iconsdir}/hicolor/*/*/kbounce*
 
 %files kenolaba -f kenolaba.lang
 %defattr(644,root,root,755)
@@ -1017,13 +1029,14 @@
 %{_datadir}/apps/knetwalk
 %{_desktopdir}/kde/lskat.desktop
 %{_desktopdir}/kde/knetwalk.desktop
-%{_iconsdir}/[!l]*/*/apps/knetwalk.png
+%{_iconsdir}/hicolor/*/apps/knetwalk.png
 
 %files kolf -f kolf.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kolf
 %attr(755,root,root) %{_libdir}/libkdeinit_kolf.so
 %attr(755,root,root) %{_libdir}/libkolf.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkolf.so.1
 %attr(755,root,root) %{_libdir}/kde3/kolf.so
 %{_datadir}/config/magic
 %{_datadir}/apps/kolf
@@ -1122,7 +1135,7 @@
 %{_datadir}/apps/kspaceduel
 %{_datadir}/config.kcfg/kspaceduel.kcfg
 %{_desktopdir}/kde/kspaceduel.desktop
-%{_iconsdir}/[!l]*/*/apps/kspaceduel.png
+%{_iconsdir}/hicolor/*/apps/kspaceduel.png
 
 %files ktron -f ktron.lang
 %defattr(644,root,root,755)
@@ -1153,7 +1166,7 @@
 %attr(755,root,games) %{_bindir}/lskatproc
 %{_datadir}/apps/lskat
 %{_desktopdir}/kde/lskat.desktop
-%{_iconsdir}/[!l]*/*/apps/lskat.png
+%{_iconsdir}/hicolor/*/apps/lskat.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -1161,7 +1174,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.175  2007-10-09 13:31:58  arekm
+Revision 1.176  2008-02-15 23:54:57  glen
+- merged KDE 3.5.9 from AC-branch
+
+Revision 1.175  2007/10/09 13:31:58  arekm
 - up to 3.5.8
 
 Revision 1.174  2007/05/21 17:41:10  cactus
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdegames.spec?r1=1.175&r2=1.176&f=u