rpms/openoffice.org/devel openoffice.org-1.9.115.ooo51745.cpputools.patch, NONE, 1.1 openoffice.org-1.9.115.ooo51755.scp2.parallel.patch, NONE, 1.1 .cvsignore, 1.60, 1.61 openoffice.org.spec, 1.289, 1.290

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Jul 9 13:25:51 UTC 2005 

Author: caolanm

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

Modified Files:
	.cvsignore openoffice.org.spec 
Added Files:
	openoffice.org-1.9.115.ooo51745.cpputools.patch 
	openoffice.org-1.9.115.ooo51755.scp2.parallel.patch 
Log Message:
bump to next version

openoffice.org-1.9.115.ooo51745.cpputools.patch:
 makefile.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-1.9.115.ooo51745.cpputools.patch ---
diff -ur ooo_SRC680_m115_src.orig/cpputools/source/registercomponent/makefile.mk ooo_SRC680_m115_src/cpputools/source/registercomponent/makefile.mk
--- ooo_SRC680_m115_src.orig/cpputools/source/registercomponent/makefile.mk	2005-07-09 09:03:32.000000000 +0200
+++ ooo_SRC680_m115_src/cpputools/source/registercomponent/makefile.mk	2005-07-09 09:07:09.000000000 +0200
@@ -121,6 +121,6 @@
 .IF "$(GUI)"=="UNX"
 ALLTAR: REGCOMPSH
 
-REGCOMPSH :
-	+-chmod +x $(MISC)$/regcomp.sh
+REGCOMPSH : $(UNIXTEXT)
+	+-chmod +x $(UNIXTEXT)
 .ENDIF	

openoffice.org-1.9.115.ooo51755.scp2.parallel.patch:
 prj/build.lst      |    0 
 scp2/prj/build.lst |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.115.ooo51755.scp2.parallel.patch ---
Index: prj/build.lst
===================================================================
RCS file: /cvs/installation/scp2/prj/build.lst,v
retrieving revision 1.16
diff -u -r1.16 build.lst
--- openoffice.org.orig/scp2/prj/build.lst	23 Jun 2005 09:59:44 -0000	1.16
+++ openoffice.org/scp2/prj/build.lst	9 Jul 2005 11:44:44 -0000
@@ -20,5 +20,5 @@
 cp    scp2\source\base            nmake    -    all    cp_base cp_langmacros NULL
 cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros NULL
 cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros NULL
-cp    scp2\source\ure             nmake    -    all    cp_ure NULL
+cp    scp2\source\ure             nmake    -    all    cp_ure cp_langmacros NULL
 cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure NULL


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	7 Jul 2005 12:28:56 -0000	1.60
+++ .cvsignore	9 Jul 2005 13:25:47 -0000	1.61
@@ -118,3 +118,4 @@
 SRC680_m113.tar.bz2
 SRC680_m114.tar.bz2
 SRC680_m115.tar.bz2
+SRC680_m116.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- openoffice.org.spec	9 Jul 2005 08:03:26 -0000	1.289
+++ openoffice.org.spec	9 Jul 2005 13:25:47 -0000	1.290
@@ -1,5 +1,5 @@
-%define ooo2ver 115
-%define ooo_rpm_release 3
+%define ooo2ver 116
+%define ooo_rpm_release 1
 %define build_fc4 0
 %define build_fc5 1
 
@@ -107,21 +107,22 @@
 Patch39: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
 Patch40: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
 Patch41: openoffice.org-1.9.110.oooXXXXX.psprintfriend.patch
-Patch42: openoffice.org-1.9.111.ooo51091.exportgcjsymbolname.jvmaccess.patch
-Patch43: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
-Patch44: openoffice.org-1.9.112.ooo51724.testtools.patch
-Patch45: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
-Patch46: openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch
-Patch47: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
-Patch48: openoffice.org-1.9.114.ooo51718.rpath.patch
-Patch49: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
-Patch50: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
-Patch51: openoffice.org-1.9.114.ooo51638.mailmerge.patch
-Patch52: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
-Patch53: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
-Patch54: openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch
-Patch55: openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch
-Patch56: openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch
+Patch42: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
+Patch43: openoffice.org-1.9.112.ooo51724.testtools.patch
+Patch44: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
+Patch45: openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch
+Patch46: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
+Patch47: openoffice.org-1.9.114.ooo51718.rpath.patch
+Patch48: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
+Patch49: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
+Patch50: openoffice.org-1.9.114.ooo51638.mailmerge.patch
+Patch51: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
+Patch52: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
+Patch53: openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch
+Patch54: openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch
+Patch55: openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch
+Patch56: openoffice.org-1.9.115.ooo51745.cpputools.patch
+Patch57: openoffice.org-1.9.115.ooo51755.scp2.parallel.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -743,21 +744,22 @@
 %patch39 -p1 -b .NONE.gcc3gcj4.patch
 %patch40 -p1 -b .ooo9290.goodies.epstoepdf.patch
 %patch41 -p1 -b .oooXXXXX.psprintfriend.patch
-%patch42 -p1 -b .ooo51091.exportgcjsymbolname.jvmaccess.patch
-%patch43 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
-%patch44 -p1 -b .ooo51724.testtools.patch
-%patch45 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
-%patch46 -p1 -b .ooo43430.cvskk.np_sdk.patch
-%patch47 -p1 -b .ooo51385.bridges.stack.patch
-%patch48 -p1 -b .ooo51718.rpath.patch
-%patch49 -p1 -b .rh161886.rpath.desktop.patch
-%patch50 -p1 -b .ooo51637.solenv.pyuno.patch
-%patch51 -p1 -b .ooo51638.mailmerge.patch
-%patch52 -p1 -b .oooXXXXX.nostlport.patch
-%patch53 -p1 -b .ooo51673.printing.checkerror.patch
-%patch54 -p1 -b .ooo51735.audio.withoutnas.patch
-%patch55 -p1 -b .ooo51736.xsltproc.evenwithjava.patch
-%patch56 -p1 -b .oooXXXXX.systemxmlsec.patch
+%patch42 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
+%patch43 -p1 -b .ooo51724.testtools.patch
+%patch44 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
+%patch45 -p1 -b .ooo43430.cvskk.np_sdk.patch
+%patch46 -p1 -b .ooo51385.bridges.stack.patch
+%patch47 -p1 -b .ooo51718.rpath.patch
+%patch48 -p1 -b .rh161886.rpath.desktop.patch
+%patch49 -p1 -b .ooo51637.solenv.pyuno.patch
+%patch50 -p1 -b .ooo51638.mailmerge.patch
+%patch51 -p1 -b .oooXXXXX.nostlport.patch
+%patch52 -p1 -b .ooo51673.printing.checkerror.patch
+%patch53 -p1 -b .ooo51735.audio.withoutnas.patch
+%patch54 -p1 -b .ooo51736.xsltproc.evenwithjava.patch
+%patch55 -p1 -b .oooXXXXX.systemxmlsec.patch
+%patch56 -p1 -b .ooo51745.cpputools.patch
+%patch57 -p1 -b .ooo51755.scp2.parallel.patch
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
 #libxmlsec/db4 then this needs to be modified/dropped
@@ -2938,6 +2940,11 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Sat Jul 09 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.116-1
+- bump to new version, Hamburg burning the midnight oil apparently
+- add openoffice.org-1.9.115.ooo51755.scp2.parallel.patch
+- drop integrated openoffice.org-1.9.111.ooo51091.exportgcjsymbolname.jvmaccess.patch
+
 * Fri Jul 08 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.115-3
 - in rawhide we should be able to use system-xmlsec1 now with 
   system-xmlsec patch

More information about the fedora-cvs-commits mailing list