Accepting request 231958 from home:jengelh:branches:science

OBS-URL: https://build.opensuse.org/request/show/231958
OBS-URL: https://build.opensuse.org/package/show/science/jmol?expand=0&rev=1
This commit is contained in:
2014-04-29 10:22:07 +00:00
committed by Git OBS Bridge
commit f31ed20b3f
7 changed files with 155 additions and 0 deletions

38
datadir.diff Normal file
View File

@@ -0,0 +1,38 @@
---
jmol.sh | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
Index: jmol-14.0.13/jmol.sh
===================================================================
--- jmol-14.0.13.orig/jmol.sh
+++ jmol-14.0.13/jmol.sh
@@ -9,28 +9,8 @@ done
# Determine installation location
if [ "$JMOL_HOME" = "" ]; then
- binDir=${0%/*}
- if [ "$binDir" = "$0" ]; then
- # Ran from local directory
- binDir=$PWD
- fi
- # Resolve symlinks.
- program="$0"
- while [ -L "$program" ]; do
- ls=`/bin/ls -ld "$program"`
- link=`/usr/bin/expr "$ls" : '.*-> \(.*\)$'`
- if /usr/bin/expr "$link" : '.*/.*' > /dev/null; then
- program="$link"
- else
- program="`/usr/bin/dirname $program`/$link"
- fi
- done
- binDir=`dirname $program`
+ JMOL_HOME="@pkgdatadir@"
fi
-
-JMOL_HOME=${JMOL_HOME:-$binDir}
-libDir=${JMOL_HOME}/jars
-
if [ ! -e ${JMOL_HOME}/Jmol.jar ]; then
echo "Jmol could not find its installed files."
exit