diff options
| author | Ingo Bauersachs <ingo@jitsi.org> | 2016-05-28 18:11:09 +0200 |
|---|---|---|
| committer | Ingo Bauersachs <ingo@jitsi.org> | 2016-05-28 18:11:09 +0200 |
| commit | 1afb3d652955b469722a0c9ab960f8cd458e0321 (patch) | |
| tree | 5f547d0d01e339e48f3e7543a8f9e13390745591 /resources | |
| parent | 3a3bf3158265bf1f8d06d7b30e8a143d499d6a72 (diff) | |
| download | jitsi-1afb3d652955b469722a0c9ab960f8cd458e0321.zip jitsi-1afb3d652955b469722a0c9ab960f8cd458e0321.tar.gz jitsi-1afb3d652955b469722a0c9ab960f8cd458e0321.tar.bz2 | |
Update dnsjava to stock 2.1.7 and make sure it is only loaded once
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/install/debian/jitsi.sh.tmpl | 2 | ||||
| -rwxr-xr-x | resources/install/linux/run.sh | 2 | ||||
| -rw-r--r-- | resources/install/rpm/SPECS/jitsi.spec | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/resources/install/debian/jitsi.sh.tmpl b/resources/install/debian/jitsi.sh.tmpl index de159db..7963135 100644 --- a/resources/install/debian/jitsi.sh.tmpl +++ b/resources/install/debian/jitsi.sh.tmpl @@ -30,7 +30,7 @@ javabin=`which java` SCDIR=/usr/share/_PACKAGE_NAME_ JITSI_COMMON_DIR=/usr/share/_PACKAGE_NAME_-common LIBPATH=$SCDIR/lib -CLASSPATH=/usr/share/java/org.apache.felix.framework.jar:/usr/share/java/org.apache.felix.main.jar:$SCDIR/sc-bundles/sc-launcher.jar:$JITSI_COMMON_DIR/util.jar/launchutils.jar:$LIBPATH +CLASSPATH=/usr/share/java/org.apache.felix.framework.jar:/usr/share/java/org.apache.felix.main.jar:/usr/share/java/dnsjava.jar:$SCDIR/sc-bundles/sc-launcher.jar:$JITSI_COMMON_DIR/util.jar/launchutils.jar:$LIBPATH FELIX_CONFIG=$LIBPATH/felix.client.run.properties LOG_CONFIG=$LIBPATH/logging.properties COMMAND="$javabin $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=/usr/lib/jni -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG $SPLASH_ARG net.java.sip.communicator.launcher.SIPCommunicator" diff --git a/resources/install/linux/run.sh b/resources/install/linux/run.sh index ef3e9ff..bd74b1a 100755 --- a/resources/install/linux/run.sh +++ b/resources/install/linux/run.sh @@ -2,4 +2,4 @@ mkdir -p $HOME/.sip-communicator/log export PATH=$PATH:native export JAVA_HOME=jre -${JAVA_HOME}/bin/java -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djna.library.path=native -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator +${JAVA_HOME}/bin/java -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/dnsjava.jar:sc-bundles/util.jar:lib/" -Djna.library.path=native -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator diff --git a/resources/install/rpm/SPECS/jitsi.spec b/resources/install/rpm/SPECS/jitsi.spec index 0998303..32bc811 100644 --- a/resources/install/rpm/SPECS/jitsi.spec +++ b/resources/install/rpm/SPECS/jitsi.spec @@ -113,6 +113,7 @@ sed -i -e "s/\/usr\/lib\/jni/\$LIBPATH\/native/" $RPM_BUILD_ROOT/usr/bin/jitsi sed -i -e "s/\/usr\/share\/java\/jdic\.jar/\$LIBPATH\/jdic_stub\.jar:\$LIBPATH\/jdic-all\.jar/" $RPM_BUILD_ROOT/usr/bin/jitsi sed -i -e "s/\/usr\/share\/java\/org\.apache\.felix\.framework\.jar/\$LIBPATH\/felix\.jar/" $RPM_BUILD_ROOT/usr/bin/jitsi sed -i -e "s/\/usr\/share\/java\/org\.apache\.felix\.main\.jar://" $RPM_BUILD_ROOT/usr/bin/jitsi +sed -i -e "s/\/usr\/share\/java\/dnsjava\.jar://" $RPM_BUILD_ROOT/usr/bin/jitsi sed -i -e "s/\/launchutils.jar//" $RPM_BUILD_ROOT/usr/bin/jitsi %clean |