SPECS: openoffice.org.spec - when system_xalan is used serializer....

[glen]

Author: glen                         Date: Sun Feb 25 13:37:57 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- when system_xalan is used serializer.jar cames from xalan

---- Files affected:
SPECS:
   openoffice.org.spec (1.701 -> 1.702) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.701 SPECS/openoffice.org.spec:1.702
--- SPECS/openoffice.org.spec:1.701	Sat Feb 24 23:54:53 2007
+++ SPECS/openoffice.org.spec	Sun Feb 25 14:37:52 2007
@@ -1,9 +1,4 @@
 # $Revision$, $Date$
-#
-#
-#RPM build errors:
-#    File not found: /home/glen/tmp/openoffice.org-2.1.0-root-glen/usr/lib/openoffice.org/program/classes/serializer.jar
-#Error: package build failed. (no more info)
 # NOTE:
 #	- normal build with java requires about 24GB of disk space
 #		$BUILD_ROOT	 7.1 GB
@@ -2113,6 +2108,7 @@
 	--with-system-gcc \
 	%{?with_system_libhnj:--with-system-altlinuxhyphen} \
 	%{?with_system_xalan:--with-system-xalan} \
+	%{?with_system_xalan:--with-serializer-jar=%{_javadir}/xalan.jar} \
 	%{?with_system_xerces:--with-system-xerces} \
 	%{?with_system_xml_apis:--with-system-xml-apis} \
 	--with-system-zlib \
@@ -2194,7 +2190,7 @@
 	--enable-access \
 	--enable-cairo \
 	--enable-crypt-link \
-	%{?with_mono:--enable-mono} %{!?with_mono:--disable-mono} \
+	--%{?with_mono:--en}%{!?with_mono:dis}able-mono \
 	--enable-pam-link \
 	--enable-openldap \
 	--enable-cups \
@@ -2856,7 +2852,7 @@
 %{_libdir}/%{name}/program/classes/ridl.jar
 %{_libdir}/%{name}/program/classes/sandbox.jar
 %{_libdir}/%{name}/program/classes/sdbc_hsqldb.jar
-%{_libdir}/%{name}/program/classes/serializer.jar
+%{!?with_system_xalan:%{_libdir}/%{name}/program/classes/serializer.jar}
 %{_libdir}/%{name}/program/classes/table.jar
 %{_libdir}/%{name}/program/classes/unoil.jar
 %{_libdir}/%{name}/program/classes/unoloader.jar
@@ -2878,7 +2874,6 @@
 %{_libdir}/%{name}/share/xslt/export/spreadsheetml
 %{_libdir}/%{name}/share/xslt/export/wordml
 %{_libdir}/%{name}/share/xslt/import
-
 %endif
 
 %{_datadir}/mime/packages/openoffice.xml
@@ -3767,6 +3762,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.702  2007/02/25 13:37:52  glen
+- when system_xalan is used serializer.jar cames from xalan
+
 Revision 1.701  2007/02/24 22:54:53  glen
 - missing jars are due using system pkgs
 - add possible java6 fix for amd64 platform
================================================================

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