diff --git a/files/jitsi.sh b/files/jitsi.sh --- a/files/jitsi.sh +++ b/files/jitsi.sh @@ -6,7 +6,11 @@ FELIX_CONFIG="$LIBPATH/felix.client.run.properties" LOG_CONFIG="$LIBPATH/logging.properties" -COMMAND=(/usr/lib/openjdk-8/bin/java -classpath "$CLASSPATH" -Djna.library.path="$LIBPATH/native" -Dfelix.config.properties="file:$FELIX_CONFIG" -Djava.util.logging.config.file="$LOG_CONFIG" net.java.sip.communicator.launcher.SIPCommunicator) +if [ -z "$JAVA_HOME" ]; then + export JAVA_HOME=/usr/lib64/openjdk-8 +fi + +COMMAND=($JAVA_HOME/bin/java -classpath "$CLASSPATH" -Djna.library.path="$LIBPATH/native" -Dfelix.config.properties="file:$FELIX_CONFIG" -Djava.util.logging.config.file="$LOG_CONFIG" net.java.sip.communicator.launcher.SIPCommunicator) export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBPATH/native" diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : jitsi version : '5633' -release : 7 +release : 8 source : - https://github.com/jitsi/jitsi/archive/5633.tar.gz : ad2ad72ac0103190f2ecd180861a12370cca1a8ca5c57474eff2967e2ca8c01e license : Apache-2.0 @@ -10,13 +10,14 @@ Jitsi is a free open-source audio/video and chat communicator builddeps : - apache-ant + - openjdk-8 rundeps : - gnome-themes-extra - openjdk-8 build : | sed 's|0\.build\.by\.SVN|%version%|' -i src/net/java/sip/communicator/impl/version/NightlyBuildID.java sed -e 's|_APP_NAME_|Jitsi|' -e 's|_PACKAGE_NAME_|jitsi|' -i resources/install/debian/jitsi.desktop.tmpl - ant rebuild + JAVA_HOME=/usr/lib64/openjdk-8 ant rebuild install : | # Refer to this article: https://desktop.jitsi.org/Documentation/HowToBuildAnInstaller @@ -32,4 +33,4 @@ install -Dm00755 $pkgfiles/jitsi.sh $installdir/usr/bin/jitsi install -Dm00644 resources/install/debian/jitsi.desktop.tmpl $installdir/usr/share/applications/jitsi.desktop install -Dm00644 resources/install/debian/jitsi.svg -t $installdir/usr/share/pixmaps - + diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ jitsi - Fabio Forni - livingsilver94.solus@redaril.me + Campbell Jones + dev@serebit.com Apache-2.0 network.im @@ -210,12 +210,12 @@ - - 2020-04-19 + + 2020-06-08 5633 Packaging update - Fabio Forni - livingsilver94.solus@redaril.me + Campbell Jones + dev@serebit.com \ No newline at end of file