[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-1.9.112.ooo51724.gcc21020.testtools.patch, NONE, 1.1 openoffice.org.spec, 1.416, 1.417 openoffice.org-1.9.112.ooo51724.testtools.patch, 1.1, NONE



Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.112.ooo51724.gcc21020.testtools.patch 
Removed Files:
	openoffice.org-1.9.112.ooo51724.testtools.patch 
Log Message:
blame testtools patch on gcc

openoffice.org-1.9.112.ooo51724.gcc21020.testtools.patch:
 source/bridgetest/makefile.mk           |    0 
 testtools/source/bridgetest/makefile.mk |    2 ++
 2 files changed, 2 insertions(+)

--- NEW FILE openoffice.org-1.9.112.ooo51724.gcc21020.testtools.patch ---
Index: source/bridgetest/makefile.mk
===================================================================
RCS file: /cvs/udk/testtools/source/bridgetest/makefile.mk,v
retrieving revision 1.21
diff -u -p -r1.21 makefile.mk
--- openoffice.org.orig/testtools/source/bridgetest/makefile.mk	17 Jun 2005 09:42:46 -0000	1.21
+++ openoffice.org/testtools/source/bridgetest/makefile.mk	27 Jun 2005 12:20:00 -0000
@@ -201,6 +201,8 @@ MY_JARS=java_uno.jar ridl.jar jurt.jar j
 MY_CLASSPATH_TMP=$(foreach,i,$(MY_JARS) $(SOLARBINDIR)$/$i)$(PATH_SEPERATOR)$(XCLASSPATH)
 MY_CLASSPATH=$(strip $(subst,!,$(PATH_SEPERATOR) $(MY_CLASSPATH_TMP:s/ /!/)))$(PATH_SEPERATOR)..$/class
 
+.EXPORT : CLASSPATH
+
 # Use "127.0.0.1" instead of "localhost", see #i32281#:
 $(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) : makefile.mk
 	-rm -f $@


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- openoffice.org.spec	24 Aug 2005 16:20:39 -0000	1.416
+++ openoffice.org.spec	25 Aug 2005 09:29:14 -0000	1.417
@@ -150,7 +150,7 @@
 Patch30: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
 Patch31: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
 Patch32: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
-Patch33: openoffice.org-1.9.112.ooo51724.testtools.patch
+Patch33: openoffice.org-1.9.112.ooo51724.gcc21020.testtools.patch
 Patch34: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
 Patch35: openoffice.org-1.9.114.ooo51718.rpath.patch
 Patch36: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
@@ -803,7 +803,7 @@
 %patch30 -p1 -b .ooo47323.binfilter.stupiddetect.patch
 %patch31 -p1 -b .NONE.gcc3gcj4.patch
 %patch32 -p1 -b .ooo9290.goodies.epstoepdf.patch
-%patch33 -p1 -b .ooo51724.testtools.patch
+%patch33 -p1 -b .ooo51724.gcc21020.testtools.patch
 %patch34 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
 %patch35 -p1 -b .ooo51718.rpath.patch
 %patch36 -p1 -b .ooo51637.solenv.pyuno.patch


--- openoffice.org-1.9.112.ooo51724.testtools.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]