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

glen glen at pld-linux.org
Thu Feb 14 23:01:33 CET 2008


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

---- Files affected:
SPECS:
   kdegames.spec (1.167.2.6 -> 1.167.2.7) 

---- Diffs:

================================================================
Index: SPECS/kdegames.spec
diff -u SPECS/kdegames.spec:1.167.2.6 SPECS/kdegames.spec:1.167.2.7
--- SPECS/kdegames.spec:1.167.2.6	Thu Feb 14 23:00:32 2008
+++ SPECS/kdegames.spec	Thu Feb 14 23:01:28 2008
@@ -820,6 +820,8 @@
 # Omit apidocs entries
 sed -i 's/.*apidocs.*//' *.lang
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -835,7 +837,6 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README README.highscore
-%{_libdir}/libkdegames.la
 %attr(755,root,root) %{_libdir}/libkdegames.so.*.*.*
 %{_datadir}/apps/kdegames
 %{_iconsdir}/*/*/actions/endturn.png
@@ -844,10 +845,15 @@
 
 %files devel
 %defattr(644,root,root,755)
+%{_libdir}/libatlantic.la
 %attr(755,root,root) %{_libdir}/libatlantic.so
+%{_libdir}/libatlantikclient.la
 %attr(755,root,root) %{_libdir}/libatlantikclient.so
+%{_libdir}/libatlantikui.la
 %attr(755,root,root) %{_libdir}/libatlantikui.so
+%{_libdir}/libkdegames.la
 %attr(755,root,root) %{_libdir}/libkdegames.so
+%{_libdir}/libkolf.la
 %attr(755,root,root) %{_libdir}/libkolf.so
 %{_includedir}/*
 
@@ -864,13 +870,9 @@
 %files atlantik -f atlantik.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/atlantik
-%{_libdir}/libatlantic.la
 %attr(755,root,root) %{_libdir}/libatlantic.so.*.*.*
-%{_libdir}/libatlantikclient.la
 %attr(755,root,root) %{_libdir}/libatlantikclient.so.*.*.*
-%{_libdir}/libatlantikui.la
 %attr(755,root,root) %{_libdir}/libatlantikui.so.*
-%{_libdir}/kde3/kio_atlantik.la
 %attr(755,root,root) %{_libdir}/kde3/kio_atlantik.so
 %{_datadir}/apps/atlantik
 %{_datadir}/services/atlantik.protocol
@@ -1018,11 +1020,8 @@
 %files kolf -f kolf.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kolf
-%{_libdir}/libkdeinit_kolf.la
 %attr(755,root,root) %{_libdir}/libkdeinit_kolf.so
-%{_libdir}/libkolf.la
 %attr(755,root,root) %{_libdir}/libkolf.so.*.*.*
-%{_libdir}/kde3/kolf.la
 %attr(755,root,root) %{_libdir}/kde3/kolf.so
 %{_datadir}/config/magic
 %{_datadir}/apps/kolf
@@ -1160,6 +1159,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.167.2.7  2008-02-14 22:01:28  glen
+- merge with HEAD
+
 Revision 1.167.2.6  2008-02-14 22:00:32  glen
 - convert to utf8
 
================================================================

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



More information about the pld-cvs-commit mailing list