SPECS: openoffice.org.spec - missing jars are due using system pkg...

[glen]

Author: glen                         Date: Sat Feb 24 22:54:58 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- missing jars are due using system pkgs
- add possible java6 fix for amd64 platform

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

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.700 SPECS/openoffice.org.spec:1.701
--- SPECS/openoffice.org.spec:1.700	Sat Feb 24 17:47:55 2007
+++ SPECS/openoffice.org.spec	Sat Feb 24 23:54:53 2007
@@ -3,9 +3,6 @@
 #
 #RPM build errors:
 #    File not found: /home/glen/tmp/openoffice.org-2.1.0-root-glen/usr/lib/openoffice.org/program/classes/serializer.jar
-#    File not found: /home/glen/tmp/openoffice.org-2.1.0-root-glen/usr/lib/openoffice.org/program/classes/xalan.jar
-#    File not found: /home/glen/tmp/openoffice.org-2.1.0-root-glen/usr/lib/openoffice.org/program/classes/xercesImpl.jar
-#    File not found: /home/glen/tmp/openoffice.org-2.1.0-root-glen/usr/lib/openoffice.org/program/classes/xml-apis.jar
 #Error: package build failed. (no more info)
 # NOTE:
 #	- normal build with java requires about 24GB of disk space
@@ -128,6 +125,7 @@
 Patch4:		%{name}-nolfs_hack.patch
 Patch5:		%{name}-no_fonts_dir_buildfix.patch
 Patch6:		%{name}-java16.patch
+Patch7:		%{name}-java6.patch
 # patches applied by ooo-patching-system
 Patch100:	%{name}-STL-lib64.diff
 Patch101:	%{name}-64bit-inline.diff
@@ -2033,6 +2031,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # 64 bit related patches (not applied now)
 install %{PATCH100} patches/64bit
@@ -2862,10 +2861,10 @@
 %{_libdir}/%{name}/program/classes/unoil.jar
 %{_libdir}/%{name}/program/classes/unoloader.jar
 %{_libdir}/%{name}/program/classes/web.jar
-%{_libdir}/%{name}/program/classes/xalan.jar
-%{_libdir}/%{name}/program/classes/xercesImpl.jar
+%{!?with_system_xalan:%{_libdir}/%{name}/program/classes/xalan.jar}
+%{!?with_system_xerces:%{_libdir}/%{name}/program/classes/xercesImpl.jar}
 %{_libdir}/%{name}/program/classes/xmerge.jar
-%{_libdir}/%{name}/program/classes/xml-apis.jar
+%{!?with_system_xml_apis:%{_libdir}/%{name}/program/classes/xml-apis.jar}
 
 %{_libdir}/%{name}/share/Scripts/beanshell
 %{_libdir}/%{name}/share/Scripts/javascript
@@ -3768,6 +3767,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.701  2007/02/24 22:54:53  glen
+- missing jars are due using system pkgs
+- add possible java6 fix for amd64 platform
+
 Revision 1.700  2007/02/24 16:47:55  glen
 - less noisy languages installation
 
================================================================

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