Author: dtardon
Update of /cvs/extras/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4303
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/signal.c | 8 ++++++++
3 files changed, 13 insertions(+), 10 deletions(-)
Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file:
/cvs/extras/rpms/openoffice.org/F-12/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 15 Sep 2009 08:24:14
-0000 1.10
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 1 Jan 2010 07:26:34
-0000 1.11
@@ -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 6ce05aa14db2 desktop/prj/build.lst
+--- a/desktop/prj/build.lst Mon Dec 28 15:58:36 2009 +0100
++++ b/desktop/prj/build.lst Wed Dec 30 09:46:09 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 6ce05aa14db2 desktop/scripts/soffice.sh
+--- a/desktop/scripts/soffice.sh Mon Dec 28 15:58:36 2009 +0100
++++ b/desktop/scripts/soffice.sh Wed Dec 30 09:46:09 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,10 @@
# 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 6ce05aa14db2 sal/osl/unx/signal.c
+--- a/sal/osl/unx/signal.c Mon Dec 28 15:58:36 2009 +0100
++++ b/sal/osl/unx/signal.c Wed Dec 30 09:46:09 2009 +0100
+@@ -191,6 +191,14 @@
if (strProgName)
{
idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "soffice");