rpms/openoffice.org/devel openoffice.org.spec,1.1092,1.1093

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29327

Modified Files:
	openoffice.org.spec 
Log Message:
testbuild


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1092
retrieving revision 1.1093
diff -u -r1.1092 -r1.1093
--- openoffice.org.spec	7 Mar 2007 09:05:22 -0000	1.1092
+++ openoffice.org.spec	7 Mar 2007 16:06:16 -0000	1.1093
@@ -1,11 +1,11 @@
 %define oootag OOF680
 %define ooomilestone 10
-%define rh_rpm_release 2
+%define rh_rpm_release 1.0
 
 # gcc#19664#
 %define stlvisibilityfcked 1
 # undef to get english only and no-langpacks for a quick smoketest build
-%define langpacks 1
+%define langpacks 0
 
 %define gtkprintui 1
 
@@ -1039,7 +1039,7 @@
 %patch64 -p1 -b .ooo74401.basctl.boost.patch
 %patch65 -p1 -b .workspace.configrefactor01.patch
 %patch66 -p1 -b .workspace.sixtyfour11.patch
-%patch67 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+#%patch67 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch68 -p1 -b .ooo68717.gstreamer.video.patch
 %patch69 -p1 -b .ooo63159.sal.dtype.patch
 %patch70 -p1 -b .ooo75167.framework.workspacerestore.patch
@@ -1122,7 +1122,7 @@
 cd instsetoo_native/util
 #get an unpackaged raw install
 export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
-export CLASSPATH=/usr/share/java/xml-commons-apis.jar
+export CLASSPATH=/usr/share/java/xerces-j2.jar:/usr/share/java/xalan-j2.jar:/usr/share/java/dom3-xerces-j2.jar
 if ! dmake openoffice_en-US; then
     echo - ---dump log start---
     cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log