rpms/openoffice.org/devel openoffice.org-2.4.0.ooo85097.desktop.pagein.patch, NONE, 1.1 openoffice.org.spec, 1.1371, 1.1372

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv759

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.4.0.ooo85097.desktop.pagein.patch 
Log Message:
add openoffice.org-2.4.0.ooo85097.desktop.pagein.patch

openoffice.org-2.4.0.ooo85097.desktop.pagein.patch:

--- NEW FILE openoffice.org-2.4.0.ooo85097.desktop.pagein.patch ---
Index: source/pagein/makefile.mk
===================================================================
RCS file: /cvs/framework/desktop/source/pagein/makefile.mk,v
retrieving revision 1.9
diff -u -r1.9 makefile.mk
--- openoffice.org.orig/desktop/source/pagein/makefile.mk	5 Oct 2006 10:47:06 -0000	1.9
+++ openoffice.org/desktop/source/pagein/makefile.mk	9 Jan 2008 07:43:34 -0000
@@ -110,7 +110,6 @@
 	@-echo $(DLLPRE)go$(UPDDLLPOST)    >> $@
 	@-echo $(DLLPRE)sb$(UPDDLLPOST)    >> $@
 	@-echo $(DLLPRE)sfx$(UPDDLLPOST)   >> $@
-	@-echo $(DLLPRE)so$(UPDDLLPOST)    >> $@
 #
 	@-echo $(DLLPRE)fwe$(UPDDLLPOST)   >> $@
 	@-echo $(DLLPRE)fwk$(UPDDLLPOST)   >> $@
@@ -122,12 +121,14 @@
 	@-echo $(DLLPRE)icuuc$(ICUDLLPOST) >> $@
 	@-echo $(DLLPRE)sot$(UPDDLLPOST)   >> $@
 	@-echo $(DLLPRE)psp$(UPDDLLPOST)   >> $@
+.IF "$(USE_SYSTEM_STL)"!="YES"
 .IF "$(COMNAME)" == "gcc2" || "$(COMNAME)" == "gcc3"
 	@-echo $(DLLPRE)stlport_gcc$(DLLPOST)    >> $@
 .ENDIF # gcc
 .IF "$(COMNAME)" == "sunpro5"
 	@-echo $(DLLPRE)stlport_sunpro$(DLLPOST) >> $@
 .ENDIF # sunpro5
+.ENDIF
 	@-echo $(DLLPRE)uno_sal$(UDKDLLPOST)   >>  $@
 	@-echo $(DLLPRE)uno_cppu$(UDKDLLPOST)  >> $@
 	@-echo $(DLLPRE)uno_cppuhelper$(COMID)$(UDKDLLPOST)           >> $@


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1371
retrieving revision 1.1372
diff -u -r1.1371 -r1.1372
--- openoffice.org.spec	8 Jan 2008 20:35:03 -0000	1.1371
+++ openoffice.org.spec	9 Jan 2008 07:48:30 -0000	1.1372
@@ -135,6 +135,7 @@
 Patch61: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
 Patch62: openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
 Patch63: openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch
+Patch64: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1084,6 +1085,7 @@
 %patch61 -p1 -b .ooo85054.stlport.noorigs.patch
 %patch62 -p1 -b .oo85055.psprint.linetoolong.patch
 %patch63 -p1 -b .oooXXXXX.config_office.xpcomasxul.patch
+%patch64 -p1 -b .ooo85097.desktop.pagein.patch
 
 # temporary until hsqldb is updated in rawhide
 sed -i -e "s/exit 1/exit 0/g" config_office/configure.in
@@ -2843,6 +2845,7 @@
 - Resolves: rhbz#427757 add openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
 - Resolves: rhbz#426876 add openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
 - add openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch to build
+- add openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
 
 * Wed Jan 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.11
 - Resolves: rhbz#427071 openoffice.org-2.3.0.ooo81314.i18npool.crash.patch