rpms/openoffice.org/F-11 openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch, 1.9, 1.10

[David Tardon]

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4533

Modified Files:
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 
Log Message:
prelink opt. uses app. libs, therefore it must depend on respective modules

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

Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-11/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	1 Jan 2010 07:27:37 -0000	1.10
@@ -1,5 +1,15 @@
---- SRC680_m123/desktop/scripts/soffice.sh.orig	2005-08-15 20:17:35.000000000 +0100
-+++ SRC680_m123/desktop/scripts/soffice.sh	2005-08-15 20:19:36.000000000 +0100
+diff -r b878ccca19b8 desktop/prj/build.lst
+--- a/desktop/prj/build.lst	Tue Dec 29 08:16:11 2009 +0100
++++ b/desktop/prj/build.lst	Wed Dec 30 09:44:16 2009 +0100
+@@ -1,4 +1,4 @@
+-dt      desktop :       sfx2 stoc uui BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp NULL
++dt      desktop :       sfx2 stoc uui BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sc sd sw NULL
+ dt	desktop									usr1	-	all	dt_mkout NULL
+ dt	desktop\inc								nmake	-	all	dt_inc NULL
+ dt	desktop\prj								get		-	all	dt_prj NULL
+diff -r b878ccca19b8 desktop/scripts/soffice.sh
+--- a/desktop/scripts/soffice.sh	Tue Dec 29 08:16:11 2009 +0100
++++ b/desktop/scripts/soffice.sh	Wed Dec 30 09:44:16 2009 +0100
 @@ -91,23 +91,22 @@
  # uncomment line below if you encounter problems starting soffice on your system
  # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
@@ -39,14 +49,23 @@
  # Set PATH so that crash_report is found:
  PATH=$sd_prog${PATH+:$PATH}
  export PATH
-Index: osl/unx/signal.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/signal.c,v
-retrieving revision 1.28
-diff -u -p -u -r1.28 signal.c
---- openoffice.org.orig/sal/osl/unx/signal.c	8 Sep 2005 15:00:57 -0000	1.28
-+++ openoffice.org/sal/osl/unx/signal.c	3 Nov 2005 11:42:52 -0000
-@@ -185,6 +185,14 @@
+diff -r b878ccca19b8 sal/osl/unx/makefile.mk
+--- a/sal/osl/unx/makefile.mk	Tue Dec 29 08:16:11 2009 +0100
++++ b/sal/osl/unx/makefile.mk	Wed Dec 30 09:44:16 2009 +0100
+@@ -142,9 +142,7 @@
+ .ENDIF
+ .ENDIF
+ 
+-.IF "$(ENABLE_CRASHDUMP)" != "" || "$(PRODUCT)" == ""
+ CFLAGS+=-DSAL_ENABLE_CRASH_REPORT
+-.ENDIF
+ 
+ .INCLUDE :  target.mk
+ 
+diff -r b878ccca19b8 sal/osl/unx/signal.c
+--- a/sal/osl/unx/signal.c	Tue Dec 29 08:16:11 2009 +0100
++++ b/sal/osl/unx/signal.c	Wed Dec 30 09:44:16 2009 +0100
+@@ -191,6 +191,14 @@
  	if (strProgName)
  	{
  		idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "soffice");
@@ -61,20 +80,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
-