rpms/openoffice.org/devel workspace.cmcfixes25.patch, NONE, 1.1 openoffice.org.spec, 1.696, 1.697
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed May 10 15:50:30 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22699
Modified Files:
openoffice.org.spec
Added Files:
workspace.cmcfixes25.patch
Log Message:
store problems
workspace.cmcfixes25.patch:
makefile.mk | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE workspace.cmcfixes25.patch ---
Index: util/makefile.mk
===================================================================
RCS file: /cvs/ucb/store/util/makefile.mk,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- openoffice.org.orig/store/util/makefile.mk 10 Jan 2006 15:52:09 -0000 1.15
+++ openoffice.org/store/util/makefile.mk 9 May 2006 15:41:55 -0000 1.16
@@ -85,7 +85,7 @@
.IF "$(CCNUMVER)"<="000399999999"
SHL1STDLIBS+= -lsupc++
.ENDIF # CCNUMVER
-.ELSE
+.ELIF "$(CCNUMVER)"<="000400000999"
SHL1STDLIBS+= -lsupc++ -lgcc_s
.ENDIF
.ENDIF
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.696
retrieving revision 1.697
diff -u -r1.696 -r1.697
--- openoffice.org.spec 10 May 2006 15:38:41 -0000 1.696
+++ openoffice.org.spec 10 May 2006 15:50:27 -0000 1.697
@@ -221,6 +221,7 @@
Patch32: openoffice.org-2.0.3.ooo65052.bridges.makeasmpic.patch
Patch33: openoffice.org-2.0.3.oooXXXXX.exceptions.sd.patch
Patch34: openoffice.org-2.0.3.ooo65230.x86_64.automation.patch
+Patch35: workspace.cmcfixes25.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -1137,6 +1138,7 @@
%patch32 -p1 -b .ooo65052.bridges.makeasmpic.patch
%patch33 -p1 -b .oooXXXXX.exceptions.sd.patch
%patch34 -p1 -b .ooo65230.x86_64.automation.patch
+%patch35 -p1 -b .workspace.cmcfixes25.patch
%if %{includingexternals}
#start ludicrous workaround
@@ -3725,6 +3727,7 @@
- add openoffice.org-2.0.3.ooo64908.sot.extraqual.patch
- add openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch workaround
- add openoffice.org-2.0.3.ooo65052.bridges.makeasmpic.patch
+- add workspace.cmcfixes25.patch
* Thu Apr 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.13
- rh#189630# lfs trouble
More information about the fedora-cvs-commits
mailing list