SPECS: openoffice.org.spec - deps for system_* java bconds should ...

[glen]

Author: glen                         Date: Sun Feb 25 16:49:51 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- deps for system_* java bconds should be also runtime as now /usr/share/java
  paths are used.

---- Files affected:
SPECS:
   openoffice.org.spec (1.703 -> 1.704) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.703 SPECS/openoffice.org.spec:1.704
--- SPECS/openoffice.org.spec:1.703	Sun Feb 25 17:43:25 2007
+++ SPECS/openoffice.org.spec	Sun Feb 25 17:49:46 2007
@@ -67,7 +67,7 @@
 %endif
 
 %define		ver		2.1.0
-%define		_rel		0.19
+%define		_rel		0.20
 %define		subver		680
 %define		snap		OOE680
 %define		snap2		SRC680
@@ -201,6 +201,7 @@
 BuildRequires:	unzip
 %{?with_system_xalan:BuildRequires:	xalan-j}
 %{?with_system_xerces:BuildRequires:	xerces-j}
+%{?with_system_xml_apis:BuildRequires:	xml-commons}
 BuildRequires:	xmlsec1-nss-devel
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXaw-devel
@@ -310,10 +311,15 @@
 Obsoletes:	openoffice.org-dirs
 Obsoletes:	openoffice.org-libs < 1:2.1.0-0.m6.0.11
 # libcups.so.2 is dlopened (in cupsmgr.cxx); maybe Suggests instead?
+%{?with_system_beanshell:Requires:	beanshell}
 Requires:	cups-lib
 Requires:	libstdc++ >= 5:3.2.1
 Requires:	mktemp
 Requires:	sed
+%{?with_system_xalan:Requires:	xalan-j}
+%{?with_system_xerces:Requires:	xerces-j}
+%{?with_system_xml_apis:Requires:	xml-commons}
+%{?with_system_xt:Requires:	xt}
 Obsoletes:	openoffice
 #Suggests:	chkfontpath
 
@@ -2089,7 +2095,7 @@
 [ "$RPM_BUILD_NR_THREADS" = "%{__make}" ] && RPM_BUILD_NR_THREADS=1
 RPM_BUILD_NR_THREADS=$(echo $RPM_BUILD_NR_THREADS)
 
-CONFOPTS=" \
+CONFOPTS="\
 %ifarch %{ix86} \
 	--with-arch=x86 \
 %endif
@@ -2139,7 +2145,7 @@
 	--with-system-sndfile \
 %if %{with system_xt}
 	--with-system-xt \
-	--with-xt-jar=/usr/share/java/classes/ \
+	--with-xt-jar=%{_javadir}/classes/ \
 %endif
 %if %{with system_beanshell}
 	--with-system-beanshell \
@@ -3761,6 +3767,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.704  2007/02/25 16:49:46  glen
+- deps for system_* java bconds should be also runtime as now /usr/share/java
+  paths are used.
+
 Revision 1.703  2007/02/25 16:43:25  glen
 - -libs dep not needed
 
================================================================

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