rpms/openoffice.org/devel openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch, 1.13, 1.14

[David Tardon]

Author: dtardon

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

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:
 prj/build.lst      |    2 -
 scripts/soffice.sh |   12 +++--------
 util/makefile.mk   |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 9 deletions(-)

Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	14 Oct 2009 08:07:26 -0000	1.13
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	1 Jan 2010 07:29:09 -0000	1.14
@@ -1,5 +1,15 @@
---- desktop.orig/scripts/soffice.sh	2005-08-15 20:17:35.000000000 +0100
-+++ desktop/scripts/soffice.sh	2005-08-15 20:19:36.000000000 +0100
+diff -r a92d0bd6747b desktop/prj/build.lst
+--- a/desktop/prj/build.lst	Mon Dec 28 16:11:17 2009 +0100
++++ b/desktop/prj/build.lst	Wed Dec 30 09:34:10 2009 +0100
+@@ -1,4 +1,4 @@
+-dt      desktop :       l10n sfx2 stoc uui BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg NULL
++dt      desktop :       l10n sfx2 stoc uui BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg 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 a92d0bd6747b desktop/scripts/soffice.sh
+--- a/desktop/scripts/soffice.sh	Mon Dec 28 16:11:17 2009 +0100
++++ b/desktop/scripts/soffice.sh	Wed Dec 30 09:34:10 2009 +0100
 @@ -73,30 +73,26 @@
    esac
  done
@@ -35,9 +45,10 @@
  
  # extend the ld_library_path for java: javaldx checks the sofficerc for us
  if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
---- desktop.orig/util/makefile.mk	2009-10-12 08:41:17.000000000 +0100
-+++ desktop/util/makefile.mk	2009-10-12 09:52:19.000000000 +0100
-@@ -189,6 +189,60 @@
+diff -r a92d0bd6747b desktop/util/makefile.mk
+--- a/desktop/util/makefile.mk	Mon Dec 28 16:11:17 2009 +0100
++++ b/desktop/util/makefile.mk	Wed Dec 30 09:34:10 2009 +0100
+@@ -192,6 +192,60 @@
  APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc
  APP5DEF=    $(MISCX)$/$(TARGET).def