rpms/openoffice.org/devel .cvsignore, 1.64, 1.65 openoffice.org.spec, 1.337, 1.338 sources, 1.91, 1.92 workspace.qwizardsbfooo20.patch, 1.1, NONE

[fedora-cvs-commits redhat com]

Author: caolanm

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	20 Jul 2005 11:02:02 -0000	1.64
+++ .cvsignore	21 Jul 2005 19:39:18 -0000	1.65
@@ -122,3 +122,4 @@
 SRC680_m117.tar.bz2
 SRC680_m118.tar.bz2
 SRC680_m119.tar.bz2
+SRC680_m120.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- openoffice.org.spec	21 Jul 2005 16:15:08 -0000	1.337
+++ openoffice.org.spec	21 Jul 2005 19:39:18 -0000	1.338
@@ -1,10 +1,10 @@
-%define ooo2ver 119
-%define ooo_rpm_release 2
+%define ooo2ver 120
+%define ooo_rpm_release 1
 %define build_fc4 0
 %define build_fc5 1
 
 # gcc#19664#
-#%define stlvisibilityfcked 0
+%define stlvisibilityfcked 1
 # rh#156039#
 %define includeexternals 1
 # define to compile with gcc3 and gcj4 mixture
@@ -23,9 +23,6 @@
 %define internalxmlsec 0
 %define internaldb 1
 %define includeemailmerge 1
-%ifarch %{ix86}
-%define stlvisibilityfcked 1
-%endif
 %endif
 
 %if %{usegcc3}
@@ -164,8 +161,7 @@
 Patch60: openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch
 Patch61: openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch
 Patch62: openoffice.org-1.9.118.forwarddecl.psprint.patch
-Patch63: workspace.qwizardsbfooo20.patch
-Patch64: openoffice.org-1.9.118.rhXXXXX.envcflags.solenv.patch
+Patch63: openoffice.org-1.9.118.rhXXXXX.envcflags.solenv.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -813,8 +809,7 @@
 %endif
 %patch61 -p1 -b .oooXXXXX.mozillanspr.extensions.patch
 %patch62 -p1 -b .forwarddecl.psprint.patch
-%patch63 -p1 -R -b .workspace.qwizardsbfooo20.patch
-# %patch64 -p1 -b .rhXXXXX.envcflags.solenv.patch
+# %patch63 -p1 -b .rhXXXXX.envcflags.solenv.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -3021,6 +3016,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Jul 20 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.120-1
+- drop redundant workspace.dummywebwizard.patch
+
 * Thu Jul 20 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.119-2
 - re-experiment with execshield GNU_STACK non X
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- sources	20 Jul 2005 11:02:06 -0000	1.91
+++ sources	21 Jul 2005 19:39:18 -0000	1.92
@@ -2,4 +2,4 @@
 176aa81d51a6ed28c5e9a14696a8d208  openoffice.org-jakubicons.tar.gz
 6b3bd4b8eb31dd067d4cb2dcc1ba5e12  openoffice.org-myspell-contrib.tar.gz
 11c0541fa373a327d1c134887ce511e7  openoffice.org-simple-crash_report.sh
-bde18f2c58007c25599726e9eeccafce  SRC680_m119.tar.bz2
+6ce92137315708a925dd57cd948c5d37  SRC680_m120.tar.bz2


--- workspace.qwizardsbfooo20.patch DELETED ---