rpms/openoffice.org/devel .cvsignore, 1.73, 1.74 openoffice.org.spec, 1.422, 1.423 sources, 1.107, 1.108 workspace.gslpatches4.patch, 1.2, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Aug 27 19:47:34 UTC 2005 

Author: caolanm

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	23 Aug 2005 18:27:10 -0000	1.73
+++ .cvsignore	27 Aug 2005 19:47:31 -0000	1.74
@@ -132,3 +132,4 @@
 SRC680_m124.tar.bz2
 SRC680_m125.tar.bz2
 opens___.ttf
+SRC680_m126.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- openoffice.org.spec	27 Aug 2005 13:57:29 -0000	1.422
+++ openoffice.org.spec	27 Aug 2005 19:47:31 -0000	1.423
@@ -1,5 +1,5 @@
 %define ooo2ver 125
-%define ooo_rpm_release 6
+%define ooo_rpm_release 1
 %define build_fc4 0
 %define build_fc5 1
 
@@ -156,24 +156,23 @@
 Patch36: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
 Patch37: openoffice.org-1.9.114.ooo51638.mailmerge.patch
 Patch38: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
-Patch39: workspace.gslpatches4.patch
-Patch40: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
-Patch41: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
-Patch42: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
-Patch43: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
-Patch44: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch
-Patch45: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
-Patch46: workspace.javapatch.patch
-Patch47: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch
-Patch48: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
-Patch49: openoffice.org-1.9.112.ooo53025.exception.package.patch
-Patch50: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch51: openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch
-Patch52: workspace.cmcfixes15.patch
-Patch53: openoffice.org-1.9.125.ooo53682.nfslock.sal.patch
-Patch54: openoffice.org-1.9.125.ooo53699.uzipunused.postprocess.patch
-Patch55: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
-Patch56: workspace.cmcfixes16.patch
+Patch39: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
+Patch40: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
+Patch41: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
+Patch42: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
+Patch43: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch
+Patch44: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
+Patch45: workspace.javapatch.patch
+Patch46: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch
+Patch47: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
+Patch48: openoffice.org-1.9.112.ooo53025.exception.package.patch
+Patch49: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch50: openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch
+Patch51: workspace.cmcfixes15.patch
+Patch52: openoffice.org-1.9.125.ooo53682.nfslock.sal.patch
+Patch53: openoffice.org-1.9.125.ooo53699.uzipunused.postprocess.patch
+Patch54: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
+Patch55: workspace.cmcfixes16.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -812,26 +811,25 @@
 %patch37 -p1 -b .ooo51638.mailmerge.patch
 %endif
 %patch38 -p1 -b .oooXXXXX.nostlport.patch
-%patch39 -p1 -b .workspace.gslpatches4.patch
-%patch40 -p1 -b .ooo51931.systemxmlsec.patch
-%patch41 -p1 -b .oooXXXXX.extensions.evolution.patch
-%patch42 -p1 -b .ooo51912.nullpointer.wizards.patch
-%patch43 -p1 -b .ooo52023.evoadb2.nognuconst.patch
-%patch44 -p1 -b .ooo49720.mozillanspr.extensions.patch
-%patch45 -p1 -b .ooo52428.execshield.bridges.patch
-%patch46 -p1 -b .workspace.javapatch.patch
+%patch39 -p1 -b .ooo51931.systemxmlsec.patch
+%patch40 -p1 -b .oooXXXXX.extensions.evolution.patch
+%patch41 -p1 -b .ooo51912.nullpointer.wizards.patch
+%patch42 -p1 -b .ooo52023.evoadb2.nognuconst.patch
+%patch43 -p1 -b .ooo49720.mozillanspr.extensions.patch
+%patch44 -p1 -b .ooo52428.execshield.bridges.patch
+%patch45 -p1 -b .workspace.javapatch.patch
 %if ! %{internaljavabits}
-%patch47 -p1 -b .ooo52974.systemhsqldbbeanshell.patch
+%patch46 -p1 -b .ooo52974.systemhsqldbbeanshell.patch
 %endif
-%patch48 -p1 -b .ooo52626.workspacerestore.vcl.patch
-%patch49 -p1 -b .ooo53025.exception.package.patch
-%patch50 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch51 -p1 -b .ooo53612.systemnp_sdk.extensions.patch
-%patch52 -p1 -b .workspace.cmcfixes15.patch
-%patch53 -p1 -b .ooo53682.nfslock.sal.patch
-%patch54 -p1 -b .ooo53699.uzipunused.postprocess.patch
-%patch55 -p1 -b .ooo53723.bulletexport.vcl.patch
-%patch56 -p1 -b .workspace.cmcfixes16.patch
+%patch47 -p1 -b .ooo52626.workspacerestore.vcl.patch
+%patch48 -p1 -b .ooo53025.exception.package.patch
+%patch49 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch50 -p1 -b .ooo53612.systemnp_sdk.extensions.patch
+%patch51 -p1 -b .workspace.cmcfixes15.patch
+%patch52 -p1 -b .ooo53682.nfslock.sal.patch
+%patch53 -p1 -b .ooo53699.uzipunused.postprocess.patch
+%patch54 -p1 -b .ooo53723.bulletexport.vcl.patch
+%patch55 -p1 -b .workspace.cmcfixes16.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -909,7 +907,7 @@
 export JAVACOMPILER=`pwd`/solenv/bin/gcj
 
 #give these security flags a whirl
-export ARCH_FLAGS="-Wp,-D_FORTIFY_SOURCE=2"
+#export ARCH_FLAGS="-Wp,-D_FORTIFY_SOURCE=2"
 #export ARCH_FLAGS="-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param ssp-buffer-size=3 -fasynchronous-unwind-tables"
 
 # see tamil translation issue rh#159381#, remove when complete and upstreamed
@@ -3118,6 +3116,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Sat Aug 27 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.126-1
+- drop integrated workspace.gslpatches4.patch
+
 * Fri Aug 26 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.125-5
 - parallel langpack installing
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- sources	24 Aug 2005 09:11:21 -0000	1.107
+++ sources	27 Aug 2005 19:47:31 -0000	1.108
@@ -5,4 +5,4 @@
 a4a22f6b80a4f02c01bbe0400e131e57  RegisterAndLicence.xcu
 73aac8274b29c79ac2041d0963faa2b8  openoffice.org-myspell-contrib.tar.gz
 66ee360bd11d33b0ba2283922d853706  opens___.ttf
-4dc996ea8b28b2c3256094e6fcc92a50  SRC680_m125.tar.bz2
+41e807729c0349b86aa1f9e6f0b5a90a  SRC680_m126.tar.bz2


--- workspace.gslpatches4.patch DELETED ---

More information about the fedora-cvs-commits mailing list