[Fedora-directory-commits] adminserver/admserv/cfgstuff console-ld-libpath.patch, 1.3, 1.4

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22342

Modified Files:
	console-ld-libpath.patch 
Log Message:
startconsole has changed for fds103, so the patch needs to change too

console-ld-libpath.patch:

Index: console-ld-libpath.patch
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/console-ld-libpath.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- console-ld-libpath.patch	23 Feb 2006 04:04:14 -0000	1.3
+++ console-ld-libpath.patch	12 Oct 2006 15:43:33 -0000	1.4
@@ -1,22 +1,17 @@
---- startconsole.orig	2006-02-22 20:45:12.000000000 -0700
-+++ startconsole	2006-02-22 20:46:03.000000000 -0700
-@@ -21,12 +21,19 @@
+--- startconsole	24 Mar 2006 19:05:16 -0000	1.2
++++ startconsole	12 Oct 2006 15:29:09 -0000
+@@ -28,11 +28,11 @@
  
- JAVA=`which java`
- if [ -z "$JAVA" -o ! -x "$JAVA" ]
- then
-   echo "$0: The java program is not in your path, or is not executable.";
-   exit 1
- fi
+ #
+ # Set library path to ensure we pick up our local libraries
+ #
+-export LD_LIBRARY_PATH=./lib:${LD_LIBRARY_PATH}
+-export SHLIB_PATH=./lib:${SHLIB_PATH}
+-export DYLD_LIBRARY_PATH=./lib:${DYLD_LIBRARY_PATH}
++export LD_LIBRARY_PATH=/opt/fedora-ds/lib:/opt/fedora-ds/shared/lib:${LD_LIBRARY_PATH}
++export SHLIB_PATH=/opt/fedora-ds/lib:/opt/fedora-ds/shared/lib:${SHLIB_PATH}
++export DYLD_LIBRARY_PATH=/opt/fedora-ds/lib:/opt/fedora-ds/shared/lib:${DYLD_LIBRARY_PATH}
  
-+LD_LIBRARY_PATH=/opt/fedora-ds/shared/lib:${LD_LIBRARY_PATH}
-+SHLIB_PATH=/opt/fedora-ds/shared/lib:${SHLIB_PATH}
-+DYLD_PATH=/opt/fedora-ds/shared/lib:${DYLD_PATH}
-+export LD_LIBRARY_PATH
-+export SHLIB_PATH
-+export DYLD_PATH
-+
  #
  # Launch the Console
  #
- java -ms8m -mx64m -cp ./java/jss3.jar:./java/ldapjdk.jar:./java/fedora-base-1.0.jar:./java/fedora-mcc-1.0.jar:./java/fedora-mcc-1.0_en.jar:./java/fedora-nmclf-1.0.jar:./java/fedora-nmclf-1.0_en.jar -Djava.library.path=./lib -Djava.util.prefs.systemRoot="$HOME/.fedora-console" -Djava.util.prefs.userRoot="$HOME/.fedora-console" com.netscape.management.client.console.Console $*