SPECS: openoffice.org.spec - files update for system agg and hunspell

glen glen at pld-linux.org
Mon Mar 5 15:19:31 CET 2007


Author: glen                         Date: Mon Mar  5 14:19:31 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- files update for system agg and hunspell

---- Files affected:
SPECS:
   openoffice.org.spec (1.711 -> 1.712) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.711 SPECS/openoffice.org.spec:1.712
--- SPECS/openoffice.org.spec:1.711	Mon Mar  5 09:08:37 2007
+++ SPECS/openoffice.org.spec	Mon Mar  5 15:19:26 2007
@@ -29,6 +29,7 @@
 #   - more system libs todo:
 #	- (SYSTEM_HYPH) bcond system_libhnj doesn't work - needs Debian-patched version of libhnj
 #	- --with-system-mythes + mythes package (http://lingucomponent.openoffice.org/thesaurus.html)
+#   - --with-system-mspack    use libmspack already installed on system
 #	- bcond system_xt doesn't work - xt in PLD is too old or broken
 #
 #	$ grep SYSTEM ooo-build-ooe680-m6/build/ooe680-m6/config_office/config.log |grep NO
@@ -46,6 +47,7 @@
 %bcond_with	mono		# enable compilation of mono bindings
 %bcond_without	mozilla		# without mozilla components
 %bcond_without	i18n		# do not create i18n packages
+%bcond_without	xvfb		# using Xvfb in build-galleries script (without xvfb broken)
 
 %bcond_without	system_beanshell
 %bcond_without	system_db		# without system (i.e. with internal) Berkeley DB
@@ -60,8 +62,6 @@
 %bcond_without	system_myspell
 %bcond_with	system_xt
 
-%bcond_without	xvfb		# using Xvfb in build-galleries script (without xvfb broken)
-
 %if %{without java}
 %undefine	with_system_beanshell
 %undefine	with_system_xalan
@@ -2985,7 +2985,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/ldapbe2.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libabp680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libadabas2.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libagg680*.so
+%{!?with_system_agg:%attr(755,root,root) %{_libdir}/%{name}/program/libagg680*.so}
 %attr(755,root,root) %{_libdir}/%{name}/program/libanimcore.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libavmedia680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libavmediagst.so
@@ -3052,7 +3052,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/libfwm680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libgcc3_uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libgo680*.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libhunspell.so
+%{!?with_system_hunspell:%attr(755,root,root) %{_libdir}/%{name}/program/libhunspell.so}
 %attr(755,root,root) %{_libdir}/%{name}/program/libhyphen680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libi18nisolang1gcc3.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libi18nregexpgcc3.so
@@ -3756,6 +3756,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.712  2007/03/05 14:19:26  glen
+- files update for system agg and hunspell
+
 Revision 1.711  2007/03/05 08:08:37  arekm
 - use serializer.jar from new xerces-j if available; fallback to xalan.jar
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.711&r2=1.712&f=u



More information about the pld-cvs-commit mailing list