rpms/openoffice.org/devel .cvsignore, 1.63, 1.64 openoffice.org.spec, 1.325, 1.326 sources, 1.90, 1.91 workspace.cmcfixes11.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jul 20 11:02:21 UTC 2005 

Author: caolanm

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

Modified Files:
	.cvsignore openoffice.org.spec sources 
Removed Files:
	workspace.cmcfixes11.patch 
Log Message:
bump to next version


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	16 Jul 2005 11:49:05 -0000	1.63
+++ .cvsignore	20 Jul 2005 11:02:02 -0000	1.64
@@ -121,3 +121,4 @@
 SRC680_m116.tar.bz2
 SRC680_m117.tar.bz2
 SRC680_m118.tar.bz2
+SRC680_m119.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- openoffice.org.spec	20 Jul 2005 07:52:16 -0000	1.325
+++ openoffice.org.spec	20 Jul 2005 11:02:02 -0000	1.326
@@ -1,5 +1,5 @@
-%define ooo2ver 118
-%define ooo_rpm_release 2
+%define ooo2ver 119
+%define ooo_rpm_release 1
 %define build_fc4 0
 %define build_fc5 1
 
@@ -141,30 +141,29 @@
 Patch40: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
 Patch41: openoffice.org-1.9.112.ooo51724.testtools.patch
 Patch42: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
-Patch43: workspace.cmcfixes11.patch
-Patch44: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
-Patch45: openoffice.org-1.9.114.ooo51718.rpath.patch
-Patch46: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
-Patch47: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
-Patch48: openoffice.org-1.9.114.ooo51638.mailmerge.patch
-Patch49: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
-Patch50: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
-Patch51: openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch
-Patch52: openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch
-Patch53: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
-Patch54: openoffice.org-1.9.115.ooo51745.cpputools.patch
-Patch55: openoffice.org-1.9.115.ooo51755.scp2.parallel.patch
-Patch56: openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
-Patch57: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
-Patch58: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
-Patch59: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
-Patch60: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
-Patch61: openoffice.org-1.9.117.ooo52048.inhalt.sw.patch
-Patch62: openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch
-Patch63: openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch
-Patch64: openoffice.org-1.9.118.forwarddecl.psprint.patch
-Patch65: openoffice.org-1.9.118.ooo52061.recursive.animations.patch
-Patch66: workspace.qwizardsbfooo20.patch
+Patch43: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
+Patch44: openoffice.org-1.9.114.ooo51718.rpath.patch
+Patch45: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
+Patch46: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
+Patch47: openoffice.org-1.9.114.ooo51638.mailmerge.patch
+Patch48: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
+Patch49: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
+Patch50: openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch
+Patch51: openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch
+Patch52: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
+Patch53: openoffice.org-1.9.115.ooo51745.cpputools.patch
+Patch54: openoffice.org-1.9.115.ooo51755.scp2.parallel.patch
+Patch55: openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
+Patch56: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
+Patch57: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
+Patch58: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
+Patch59: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
+Patch60: openoffice.org-1.9.117.ooo52048.inhalt.sw.patch
+Patch61: openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch
+Patch62: openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch
+Patch63: openoffice.org-1.9.118.forwarddecl.psprint.patch
+Patch64: openoffice.org-1.9.118.ooo52061.recursive.animations.patch
+Patch65: workspace.qwizardsbfooo20.patch
 Patch67: openoffice.org-1.9.118.rhXXXXX.envcflags.solenv.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
@@ -789,35 +788,34 @@
 %patch40 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
 %patch41 -p1 -b .ooo51724.testtools.patch
 %patch42 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
-%patch43 -p1 -b .workspace.cmcfixes11.patch
-%patch44 -p1 -b .ooo51385.bridges.stack.patch
-%patch45 -p1 -b .ooo51718.rpath.patch
-%patch46 -p1 -b .rh161886.rpath.desktop.patch
-%patch47 -p1 -b .ooo51637.solenv.pyuno.patch
+%patch43 -p1 -b .ooo51385.bridges.stack.patch
+%patch44 -p1 -b .ooo51718.rpath.patch
+%patch45 -p1 -b .rh161886.rpath.desktop.patch
+%patch46 -p1 -b .ooo51637.solenv.pyuno.patch
 %if %{includeemailmerge}
-%patch48 -p1 -b .ooo51638.mailmerge.patch
+%patch47 -p1 -b .ooo51638.mailmerge.patch
 %endif
-%patch49 -p1 -b .oooXXXXX.nostlport.patch
-%patch50 -p1 -b .ooo51673.printing.checkerror.patch
-%patch51 -p1 -b .ooo51735.audio.withoutnas.patch
-%patch52 -p1 -b .ooo51736.xsltproc.evenwithjava.patch
-%patch53 -p1 -b .ooo51931.systemxmlsec.patch
-%patch54 -p1 -b .ooo51745.cpputools.patch
-%patch55 -p1 -b .ooo51755.scp2.parallel.patch
-%patch56 -p1 -b .ooo51774.rsc.parallel.patch
-%patch57 -p1 -b .oooXXXXX.extensions.evolution.patch
-%patch58 -p1 -b .rh163147.thorndale.fontconfig.patch
-%patch59 -p1 -b .ooo51912.nullpointer.wizards.patch
-%patch60 -p1 -b .ooo52023.evoadb2.nognuconst.patch
-%patch61 -p1 -b .ooo52048.inhalt.sw.patch
+%patch48 -p1 -b .oooXXXXX.nostlport.patch
+%patch49 -p1 -b .ooo51673.printing.checkerror.patch
+%patch50 -p1 -b .ooo51735.audio.withoutnas.patch
+%patch51 -p1 -b .ooo51736.xsltproc.evenwithjava.patch
+%patch52 -p1 -b .ooo51931.systemxmlsec.patch
+%patch53 -p1 -b .ooo51745.cpputools.patch
+%patch54 -p1 -b .ooo51755.scp2.parallel.patch
+%patch55 -p1 -b .ooo51774.rsc.parallel.patch
+%patch56 -p1 -b .oooXXXXX.extensions.evolution.patch
+%patch57 -p1 -b .rh163147.thorndale.fontconfig.patch
+%patch58 -p1 -b .ooo51912.nullpointer.wizards.patch
+%patch59 -p1 -b .ooo52023.evoadb2.nognuconst.patch
+%patch60 -p1 -b .ooo52048.inhalt.sw.patch
 %if %{build_fc5}
-%patch62 -p1 -b .rh150643.fontconfigalwayssystemfont.vcl.patch
+%patch61 -p1 -b .rh150643.fontconfigalwayssystemfont.vcl.patch
 %endif
-%patch63 -p1 -b .oooXXXXX.mozillanspr.extensions.patch
-%patch64 -p1 -b .forwarddecl.psprint.patch
-%patch65 -p1 -b .ooo52061.recursive.animations.patch
-%patch66 -p1 -R -b .workspace.qwizardsbfooo20.patch
-%patch67 -p1 -b .rhXXXXX.envcflags.solenv.patch
+%patch62 -p1 -b .oooXXXXX.mozillanspr.extensions.patch
+%patch63 -p1 -b .forwarddecl.psprint.patch
+%patch64 -p1 -b .ooo52061.recursive.animations.patch
+%patch65 -p1 -R -b .workspace.qwizardsbfooo20.patch
+%patch66 -p1 -b .rhXXXXX.envcflags.solenv.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -3022,8 +3020,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Wed Jul 20 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.118-2
+* Wed Jul 20 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.119-1
 - experiment with security flags
+- drop integrated cmcfixes11.workspace
 
 * Sat Jul 16 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.118-1
 - add experiemental rh150643.fontconfigalwayssystemfont.vcl.patch


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- sources	16 Jul 2005 11:49:05 -0000	1.90
+++ sources	20 Jul 2005 11:02:06 -0000	1.91
@@ -2,4 +2,4 @@
 176aa81d51a6ed28c5e9a14696a8d208  openoffice.org-jakubicons.tar.gz
 6b3bd4b8eb31dd067d4cb2dcc1ba5e12  openoffice.org-myspell-contrib.tar.gz
 11c0541fa373a327d1c134887ce511e7  openoffice.org-simple-crash_report.sh
-b7f275c709a63f146514e6511fef0507  SRC680_m118.tar.bz2
+bde18f2c58007c25599726e9eeccafce  SRC680_m119.tar.bz2


--- workspace.cmcfixes11.patch DELETED ---

More information about the fedora-cvs-commits mailing list