SPECS: openoffice.org.spec - exclude nsplugin when `--without mozi...
adamg
adamg at pld-linux.org
Tue Jul 11 14:17:45 CEST 2006
Author: adamg Date: Tue Jul 11 12:17:45 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- exclude nsplugin when `--without mozilla' bcond passed
- avoid dependency on kdelibs-libs in openoffice.org-libs (noticed by
patrys and aflinta)
---- Files affected:
SPECS:
openoffice.org.spec (1.604 -> 1.605)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.604 SPECS/openoffice.org.spec:1.605
--- SPECS/openoffice.org.spec:1.604 Tue Jul 11 12:49:13 2006
+++ SPECS/openoffice.org.spec Tue Jul 11 14:17:39 2006
@@ -2241,7 +2241,9 @@
#%attr(755,root,root) %{_libdir}/%{name}/program/sweb
%attr(755,root,root) %{_libdir}/%{name}/program/swriter
%attr(755,root,root) %{_libdir}/%{name}/program/open-url
+%if %{with mozilla}
%attr(755,root,root) %{_libdir}/%{name}/program/nsplugin
+%endif
%attr(755,root,root) %{_libdir}/%{name}/program/gengal
%attr(755,root,root) %{_libdir}/%{name}/program/configimport
%attr(755,root,root) %{_libdir}/%{name}/program/sbase
@@ -2301,6 +2303,7 @@
#%dir %{_libdir}/%{name}/program/filter
%attr(755,root,root) %{_libdir}/%{name}/program/*.so
+%exclude %{_libdir}/%{name}/program/kdebe1.uno.so
%exclude %{_libdir}/%{name}/program/libvclplug_gtk*.so
%exclude %{_libdir}/%{name}/program/libvclplug_kde*.so
%exclude %{_libdir}/%{name}/program/libfps_kde.so
@@ -2314,6 +2317,7 @@
%files libs-kde
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/program/kdebe1.uno.so
%attr(755,root,root) %{_libdir}/%{name}/program/kdefilepicker
%attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_kde*.so
%attr(755,root,root) %{_libdir}/%{name}/program/libfps_kde.so
@@ -2334,6 +2338,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.605 2006/07/11 12:17:39 adamg
+- exclude nsplugin when `--without mozilla' bcond passed
+- avoid dependency on kdelibs-libs in openoffice.org-libs (noticed by
+ patrys and aflinta)
+
Revision 1.604 2006/07/11 10:49:13 cieciwa
- updated BR - openclipart
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.604&r2=1.605&f=u
More information about the pld-cvs-commit
mailing list