Author: glen Date: Thu Feb 14 22:49:28 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- merge with HEAD
---- Files affected:
SPECS:
kdetoys.spec (1.102.2.6 -> 1.102.2.7)
---- Diffs:
================================================================
Index: SPECS/kdetoys.spec
diff -u SPECS/kdetoys.spec:1.102.2.6 SPECS/kdetoys.spec:1.102.2.7
--- SPECS/kdetoys.spec:1.102.2.6 Thu Feb 14 23:48:56 2008
+++ SPECS/kdetoys.spec Thu Feb 14 23:49:23 2008
@@ -243,6 +243,8 @@
DESTDIR=$RPM_BUILD_ROOT \
kde_htmldir=%{_kdedocdir}
+rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+
%find_lang amor --with-kde
%find_lang kmoon --with-kde
%find_lang kodo --with-kde
@@ -256,6 +258,7 @@
%files devel
%defattr(644,root,root,755)
%{_includedir}/*.h
+%{_libdir}/lib*.la
%files amor -f amor.lang
%defattr(644,root,root,755)
@@ -266,19 +269,16 @@
%files eyes
%defattr(644,root,root,755)
-%{_libdir}/kde3/eyes_panelapplet.la
%attr(755,root,root) %{_libdir}/kde3/eyes_panelapplet.so
%{_datadir}/apps/kicker/applets/eyesapplet.desktop
%files fifteen
%defattr(644,root,root,755)
-%{_libdir}/kde3/fifteen_panelapplet.la
%attr(755,root,root) %{_libdir}/kde3/fifteen_panelapplet.so
%{_datadir}/apps/kicker/applets/kfifteenapplet.desktop
%files kmoon -f kmoon.lang
%defattr(644,root,root,755)
-%{_libdir}/kde3/kmoon_panelapplet.la
%attr(755,root,root) %{_libdir}/kde3/kmoon_panelapplet.so
%{_datadir}/apps/kicker/applets/kmoonapplet.desktop
%{_datadir}/apps/kmoon
@@ -309,15 +309,10 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kweatherreport
%attr(755,root,root) %{_bindir}/kweatherservice
-%{_libdir}/libkdeinit_kweatherreport.la
%attr(755,root,root) %{_libdir}/libkdeinit_kweatherreport.so
-%{_libdir}/kde3/kcm_weather.la
%attr(755,root,root) %{_libdir}/kde3/kcm_weather.so
-%{_libdir}/kde3/kcm_weatherservice.la
%attr(755,root,root) %{_libdir}/kde3/kcm_weatherservice.so
-%{_libdir}/kde3/kweatherreport.la
%attr(755,root,root) %{_libdir}/kde3/kweatherreport.so
-%{_libdir}/kde3/weather_panelapplet.la
%attr(755,root,root) %{_libdir}/kde3/weather_panelapplet.so
%{_datadir}/apps/kicker/applets/kweather.desktop
%{_datadir}/apps/kweatherservice
@@ -334,7 +329,6 @@
%{_datadir}/apps/kdesktop/programs/kdeworld.desktop
%{_desktopdir}/kde/kworldclock.desktop
%{_iconsdir}/*/*/*/kworldclock*
-%{_libdir}/kde3/ww_panelapplet.la
%attr(755,root,root) %{_libdir}/kde3/ww_panelapplet.so
%{_datadir}/apps/kicker/applets/kwwapplet.desktop
@@ -344,6 +338,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.102.2.7 2008-02-14 22:49:23 glen
+- merge with HEAD
+
Revision 1.102.2.6 2008-02-14 22:48:56 glen
- convert to utf8
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdetoys.spec?r1=1.102.2.6&r2=1.102.2.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
