rpms/openoffice.org/devel openoffice.org-1.9.114.rh161886.rpath.desktop.patch, 1.5, 1.6 openoffice.org.spec, 1.1184, 1.1185

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Wed May 23 12:56:20 UTC 2007 

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29309

Modified Files:
	openoffice.org-1.9.114.rh161886.rpath.desktop.patch 
	openoffice.org.spec 
Log Message:
remove LD_LIBRARY_PATH hack again

openoffice.org-1.9.114.rh161886.rpath.desktop.patch:

Index: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.114.rh161886.rpath.desktop.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-1.9.114.rh161886.rpath.desktop.patch	29 Jan 2007 13:41:40 -0000	1.5
+++ openoffice.org-1.9.114.rh161886.rpath.desktop.patch	23 May 2007 12:55:44 -0000	1.6
@@ -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
-@@ -77,28 +79,16 @@
+@@ -79,81 +79,6 @@
  # change back directory
  cd "$sd_cwd"
  
@@ -17,70 +17,102 @@
 -    fi
 -fi
 -
- # set search path for shared libraries
+-# set search path for shared libraries
 -add_moz_lib=
 -for moz_lib_path in $MOZILLA_LIBRARY_PATH /usr/lib /usr/lib/mozilla /usr/lib/mozilla-firefox /usr/lib/mozilla-thunderbird /opt/mozilla/lib /opt/MozillaFirefox/lib /opt/MozillaThunderbird/lib; do
 -	test -f $moz_lib_path/libnss3.so && add_moz_lib=":$moz_lib_path" && break;
 -done
- case $sd_platform in
-   AIX)
-     # this is a temporary hack until we can live with the default search paths
-     if [ $LIBPATH ]; then
-       SYSTEM_LIBPATH=$LIBPATH
-       export SYSTEM_LIBPATH
+-case $sd_platform in
+-  AIX)
+-    # this is a temporary hack until we can live with the default search paths
+-    if [ $LIBPATH ]; then
+-      SYSTEM_LIBPATH=$LIBPATH
+-      export SYSTEM_LIBPATH
 -      LIBPATH="$sd_prog$add_moz_lib":$LIBPATH
-+      LIBPATH="$sd_prog":$LIBPATH
-     else
+-    else
 -      LIBPATH="$sd_prog$add_moz_lib"
-+      LIBPATH="$sd_prog"
-     fi
-     export LIBPATH
-     ;;
-@@ -108,9 +98,9 @@
-     if [ $DYLD_LIBRARY_PATH ]; then 
-       SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
-       export SYSTEM_DYLD_LIBRARY_PATH
+-    fi
+-    export LIBPATH
+-    ;;
+-
+-  Darwin)
+-    # this is a temporary hack until we can live with the default search paths
+-    if [ $DYLD_LIBRARY_PATH ]; then 
+-      SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
+-      export SYSTEM_DYLD_LIBRARY_PATH
 -      DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib":$DYLD_LIBRARY_PATH
-+      DYLD_LIBRARY_PATH="$sd_prog":$DYLD_LIBRARY_PATH
-     else
+-    else
 -      DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib"
-+      DYLD_LIBRARY_PATH="$sd_prog"
-     fi
-     export DYLD_LIBRARY_PATH
-     ;;
-@@ -120,9 +110,9 @@
-     if [ $SHLIB_PATH ]; then
-       SYSTEM_SHLIB_PATH=$SHLIB_PATH
-       export SYSTEM_SHLIB_PATH
+-    fi
+-    export DYLD_LIBRARY_PATH
+-    ;;
+-
+-  HP-UX)
+-    # this is a temporary hack until we can live with the default search paths
+-    if [ $SHLIB_PATH ]; then
+-      SYSTEM_SHLIB_PATH=$SHLIB_PATH
+-      export SYSTEM_SHLIB_PATH
 -      SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib:$SHLIB_PATH
-+      SHLIB_PATH="$sd_prog":/usr/openwin/lib:$SHLIB_PATH
-     else
+-    else
 -      SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib
-+      SHLIB_PATH="$sd_prog":/usr/openwin/lib
-     fi
-     export SHLIB_PATH
-     ;;
-@@ -132,9 +122,9 @@
-     if [ $LD_LIBRARYN32_PATH ]; then
-        SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH
-        export SYSTEM_LD_LIBRARYN32_PATH
+-    fi
+-    export SHLIB_PATH
+-    ;;
+-
+-  IRIX*)
+-    # this is a temporary hack until we can live with the default search paths
+-    if [ $LD_LIBRARYN32_PATH ]; then
+-       SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH
+-       export SYSTEM_LD_LIBRARYN32_PATH
 -       LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib":$LD_LIBRARYN32_PATH
-+       LD_LIBRARYN32_PATH=:"$sd_prog":$LD_LIBRARYN32_PATH
-     else
+-    else
 -       LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib"
-+       LD_LIBRARYN32_PATH=:"$sd_prog"
-     fi
-     export LD_LIBRARYN32_PATH
-     ;;
-@@ -144,9 +134,9 @@
-     if [ $LD_LIBRARY_PATH ]; then
-       SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-       export SYSTEM_LD_LIBRARY_PATH
+-    fi
+-    export LD_LIBRARYN32_PATH
+-    ;;
+-
+-  *)
+-    # this is a temporary hack until we can live with the default search paths
+-    if [ $LD_LIBRARY_PATH ]; then
+-      SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+-      export SYSTEM_LD_LIBRARY_PATH
 -      LD_LIBRARY_PATH="$sd_prog$add_moz_lib":$LD_LIBRARY_PATH
-+      LD_LIBRARY_PATH="$sd_prog":$LD_LIBRARY_PATH
-     else
+-    else
 -      LD_LIBRARY_PATH="$sd_prog$add_moz_lib"
-+      LD_LIBRARY_PATH="$sd_prog"
+-    fi
+-    export LD_LIBRARY_PATH
+-    ;;
+-esac
+-
+ #collect all bootstrap variables specified on the command line
+ #so that they can be passed as arguments to javaldx later on
+ for arg in $@
+@@ -167,23 +92,11 @@
+ if [ -x "$sd_prog/javaldx" ] ; then
+     java_ld_library_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS`
+     if [ "$java_ld_library_path" != "" ] ; then
+-        case $sd_platform in
+-            AIX)
+-                LIBPATH=${java_ld_library_path}:${LIBPATH}
+-                ;;
+-            Darwin)
+-                DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
+-                ;;
+-            HP-UX)
+-                SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
+-                ;;
+-            IRIX*)
+-                LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
+-                ;;
+-            *)
+-                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
      fi
-     export LD_LIBRARY_PATH
-     ;;
+ fi
+ 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1184
retrieving revision 1.1185
diff -u -r1.1184 -r1.1185
--- openoffice.org.spec	22 May 2007 11:59:34 -0000	1.1184
+++ openoffice.org.spec	23 May 2007 12:55:44 -0000	1.1185
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 17
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -29,7 +29,7 @@
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        2.2.1
-Release: 	%{ooomilestone}.%{rh_rpm_release}
+Release: 	%{ooomilestone}.%{rh_rpm_release}%{?dist}
 Epoch:		1
 License:	LGPL
 Group:		Applications/Productivity
@@ -2642,6 +2642,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed May 23 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-17.2
+- remove LD_LIBRARY_PATH again, the third party extension requiring it 
+  links against the wrong libraries
+
 * Tue May 22 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-17.1
 - next 2.2.1 release candidate
 - add workspace.cmcfixes34.patch for int(0) not being promoted to long

More information about the fedora-extras-commits mailing list