SPECS: openoffice.org.spec - added temporary bcond xvfb - added BR...

[sls]

Author: sls                          Date: Thu Jan  4 21:56:33 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added temporary bcond xvfb
- added BR: xorg-font-font-{misc-misc-base,cursor-misc} needed to run Xvfb

---- Files affected:
SPECS:
   openoffice.org.spec (1.660 -> 1.661) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.660 SPECS/openoffice.org.spec:1.661
--- SPECS/openoffice.org.spec:1.660	Thu Jan  4 22:34:35 2007
+++ SPECS/openoffice.org.spec	Thu Jan  4 22:56:28 2007
@@ -12,6 +12,9 @@
 #       - bcond with_mono is broken (cli_types.dll not found, and can't be made)
 #	- build on 64-bit architectures
 #       - adapt help-support.diff to PLD
+#	- make --without xvfb working, required
+#	  REMOVE USE of Xvfb from build-galleries script (ooo-build-2.0.1.2/bin/build-galleries line 84)
+#	  then remove that bcond
 # MAYBE TODO:
 #	- drop requirement on nas-devel
 #	- --with-system-myspell + myspell package as in Debian
@@ -22,7 +25,6 @@
 #	- fix locale names and other locale related things
 #       - can't be just i18n-{be,gu,hi,kn,pa,ta} instead of *-{be_BY,*_IN}?
 #	- add option to build with {not} all lanquages
-#	- REMOVE USE of Xvfb from build-galleries script (ooo-build-2.0.1.2/bin/build-galleries line 84)
 #   - more system libs todo:
 #	$ grep SYSTEM ooo-build-ooe680-m6/build/ooe680-m6/config_office/config.log |grep NO
 #	SYSTEM_AGG='NO'
@@ -54,6 +56,8 @@
 %bcond_without	system_beanshell
 %bcond_without	system_libhnj		# with internal ALTLinuxhyph
 
+%bcond_without	xvfb		# using Xvfb in build-galleries script (without xvfb broken)
+
 %define		ver		2.1.0
 %define		_rel		0.10
 %define		subver		680
@@ -190,7 +194,12 @@
 BuildRequires:	xmlsec1-nss-devel
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXaw-devel
+%if %{with xvfb}
+#BuildRequires:	xorg-app-mkfontdir	(missing PreReq in fonts?)
+BuildRequires:	xorg-font-font-cursor-misc
+BuildRequires:	xorg-font-font-misc-misc-base
 BuildRequires:	xorg-xserver-Xvfb
+%endif
 %{?with_system_xt:BuildRequires:	xt}
 BuildRequires:	zip
 BuildRequires:	zlib-devel
@@ -3380,6 +3389,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.661  2007/01/04 21:56:28  sls
+- added temporary bcond xvfb
+- added BR: xorg-font-font-{misc-misc-base,cursor-misc} needed to run Xvfb
+
 Revision 1.660  2007/01/04 21:34:35  glen
 - expand share/registry/schema
 
================================================================

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