rpms/openoffice.org/devel openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch, NONE, 1.1 openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch, 1.9, 1.10 openoffice.org.spec, 1.2007, 1.2008

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14265

Modified Files:
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch 
Log Message:
add openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch to go through abrt

openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch:
 signal.c |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch ---
--- openoffice.org.orig/sal/osl/unx/signal.c	2009-09-15 09:14:35.000000000 +0100
+++ openoffice.org/sal/osl/unx/signal.c	2009-09-15 09:14:40.000000000 +0100
@@ -77,10 +77,14 @@
 #include "file_path_helper.h"
 
 #define ACT_IGNORE	1
-#define ACT_ABORT	2
-#define ACT_EXIT	3
-#define ACT_SYSTEM	4
-#define ACT_HIDE	5
+#define ACT_EXIT	2
+#define ACT_SYSTEM	3
+#define ACT_HIDE	4
+#ifdef SAL_ENABLE_CRASH_REPORT
+#    define ACT_ABORT	5
+#else
+#    define ACT_ABORT   ACT_SYSTEM
+#endif
 
 #define MAX_PATH_LEN	2048
 
@@ -401,7 +405,7 @@
 
 #define REPORTENV_PARAM		"-crashreportenv:"
 
-#ifdef LINUX
+#if defined(LINUX) && defined(SAL_ENABLE_CRASH_REPORT)
 
 typedef struct
 {

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

Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	1 Sep 2008 12:09:07 -0000	1.9
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	15 Sep 2009 08:24:14 -0000	1.10
@@ -61,20 +61,3 @@ diff -u -p -u -r1.28 signal.c
  		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/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2007
retrieving revision 1.2008
diff -u -p -r1.2007 -r1.2008
--- openoffice.org.spec	15 Sep 2009 08:19:35 -0000	1.2007
+++ openoffice.org.spec	15 Sep 2009 08:24:14 -0000	1.2008
@@ -160,6 +160,7 @@ Patch82: workspace.vcl102.patch
 Patch83: openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
 Patch84: workspace.dr69.patch
 Patch85: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
+Patch86: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1705,6 +1706,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch83 -p0 -b .ooo104157.svx.crashonencryptparse.patch
 %patch84 -p0 -b .workspace.dr69.patch
 %patch85 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
+%patch86 -p0 -b .oooXXXXXX.sal.justcoredump.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4248,12 +4250,13 @@ fi
 
 %changelog
 * Tue Sep 15 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.8-UNBUILT
-- disable NumberFormatRecognition from default writer configuration
-- Resolves: 522056 - wrong match of fonts (non-)proportional
+- disable NumberFormatRecognition from default writer configuration (caolanm)
+- Resolves: rhbz#522056 - wrong match of fonts (non-)proportional (dtardon)
+- add openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch to go through abrt (caolanm)
 
 * Mon Sep 14 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.7
-- make oo.o buildable without langpacks again
-- Resolves: rhbz#523106 [indic] changed names of lohit-* fonts
+- make oo.o buildable without langpacks again (dtardon)
+- Resolves: rhbz#523106 [indic] changed names of lohit-* fonts (dtardon)
 
 * Tue Sep 08 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.6
 - Resolves: ooo#104484 workspace.dr69.patch