rpms/openoffice.org/devel openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch, 1.4, 1.5 openoffice.org.spec, 1.963, 1.964

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 
	openoffice.org.spec 
Log Message:
move into a patch instead

openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:
 SRC680_m123/desktop/scripts/soffice.sh |   12 ++++--------
 osl/unx/makefile.mk                    |    0 
 osl/unx/signal.c                       |    0 
 sal/osl/unx/makefile.mk                |    2 --
 sal/osl/unx/signal.c                   |    8 ++++++++
 5 files changed, 12 insertions(+), 10 deletions(-)

Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	13 Aug 2006 13:43:16 -0000	1.4
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	2 Dec 2006 11:40:26 -0000	1.5
@@ -60,3 +60,20 @@
  		rtl_string_release (strProgName);
  	}
  	return (idx != -1);
+Index: osl/unx/makefile.mk
+===================================================================
+RCS file: /cvs/porting/sal/osl/unx/makefile.mk,v
+retrieving revision 1.28.42.1
+diff -u -r1.28.42.1 makefile.mk
+--- openoffice.org.orig/sal/osl/unx/makefile.mk	3 Nov 2006 11:39:24 -0000	1.28.42.1
++++ openoffice.org/sal/osl/unx/makefile.mk	2 Dec 2006 11:38:16 -0000
+@@ -136,9 +136,7 @@
+ .ENDIF
+ .ENDIF
+ 
+-.IF "$(ENABLE_CRASHDUMP)" != "" || "$(PRODUCT)" == ""
+ CFLAGS+=-DSAL_ENABLE_CRASH_REPORT
+-.ENDIF
+ 
+ .INCLUDE :  target.mk
+ 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.963
retrieving revision 1.964
diff -u -r1.963 -r1.964
--- openoffice.org.spec	1 Dec 2006 16:35:06 -0000	1.963
+++ openoffice.org.spec	2 Dec 2006 11:40:26 -0000	1.964
@@ -1040,8 +1040,6 @@
 export WITHOUT_PPDS="YES"
 export WITHOUT_AFMS="YES"
 export SCPDEFS="$SCPDEFS -DWITHOUT_AFMS -DWITHOUT_PPDS"
-#don't build the builtin crashreporter, but do call our replacement on crash
-export ENABLE_CRASHDUMP="YES"
 #force linker
 export LINK=$CXX
 #faster build