rpms/openoffice.org/devel openoffice.org-1.9.114.rh161886.rpath.desktop.patch, 1.1, 1.2 sources, 1.131, 1.132

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.114.rh161886.rpath.desktop.patch sources 
Log Message:
desktop script changed, rejig patch

openoffice.org-1.9.114.rh161886.rpath.desktop.patch:
 desktop/scripts/soffice.sh |   98 ++-------------------------------------------
 scripts/soffice.sh         |    0 
 2 files changed, 5 insertions(+), 93 deletions(-)

Index: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.114.rh161886.rpath.desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.114.rh161886.rpath.desktop.patch	5 Jul 2005 08:40:07 -0000	1.1
+++ openoffice.org-1.9.114.rh161886.rpath.desktop.patch	15 Nov 2005 16:50:45 -0000	1.2
@@ -5,7 +5,7 @@
 diff -u -p -r1.17 soffice.sh
 --- openoffice.org.orig/desktop/scripts/soffice.sh	15 Jun 2005 08:16:47 -0000	1.17
 +++ openoffice.org/desktop/scripts/soffice.sh	5 Jul 2005 07:49:51 -0000
-@@ -92,103 +92,15 @@ sd_inst="`pwd`"
+@@ -73,82 +73,6 @@
  # change back directory
  cd "$sd_cwd"
  
@@ -85,9 +85,12 @@
 -    ;;
 -esac
 -
- # extend the ld_library_path for java: javaldx checks the sofficerc for us
+ #collect all bootstrap variables specified on the command line
+ #so that they can be passed as arguments to javaldx later on
+ for arg in $@
+@@ -162,23 +86,11 @@
  if [ -x "$sd_prog/javaldx" ] ; then
-     java_ld_library_path=`"$sd_prog/javaldx"`
+     java_ld_library_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS`
      if [ "$java_ld_library_path" != "" ] ; then
 -        case $sd_platform in
 -            AIX)
@@ -106,11 +109,11 @@
 -                LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
 -                ;;
 -        esac
-+        if [ $LD_LIBRARY_PATH ]; then
-+            LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
-+        else
-+            LD_LIBRARY_PATH=${java_ld_library_path}
-+        fi
++         if [ $LD_LIBRARY_PATH ]; then
++             LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
++         else
++             LD_LIBRARY_PATH=${java_ld_library_path}
++         fi
      fi
  fi
  


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- sources	15 Nov 2005 16:10:12 -0000	1.131
+++ sources	15 Nov 2005 16:50:45 -0000	1.132
@@ -6,5 +6,5 @@
 e134623af5c26a275caafb05f7f267c7  openoffice.org-myspell-contrib.tar.gz
 535b25a1e51d4b5ab6b20cbedddf21ce  GSI_hi-IN.sdf
 1825a3b182fd46e08075a42257cfc6aa  gcj-sed.sh
-04819271d356f7885a255617dff421d8  openoffice.org-simple-crash_report.sh
 27071256f362853388826f79580ce5c5  SRC680_m140.tar.bz2
+ab46792df4dd81f27a9c08d1e18a35a8  openoffice.org-simple-crash_report.sh