diff --git a/files/Use-openjdk-8.patch b/files/Use-openjdk-8.patch new file mode 100644 --- /dev/null +++ b/files/Use-openjdk-8.patch @@ -0,0 +1,44 @@ +From a659f7297968befcbc25403fa54abc1aecdba43b Mon Sep 17 00:00:00 2001 +From: Fabio Forni +Date: Thu, 7 May 2020 22:58:13 +0200 +Subject: [PATCH] Use openjdk-8 + +--- + projectlibre_build/resources/projectlibre.sh | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/projectlibre_build/resources/projectlibre.sh b/projectlibre_build/resources/projectlibre.sh +index babfd31..3c86396 100755 +--- a/projectlibre_build/resources/projectlibre ++++ b/projectlibre_build/resources/projectlibre +@@ -56,15 +56,21 @@ + # logo it must direct them back to http://www.projectlibre.com. + #******************************************************************************* + +-CONF_DIR="$HOME/.projectlibre" ++if [ -d $XDG_CONFIG_HOME ]; then ++ CONF_DIR="$XDG_CONFIG_HOME/projectlibre" ++else ++ CONF_DIR="$HOME/.config/projectlibre" ++fi ++ ++# Migrate the old conf dir ++if [ -d "$HOME/.projectlibre" ]; then ++ mv "$HOME/.projectlibre" "$CONF_DIR" ++fi ++ + RUN_CONF="$CONF_DIR/run.conf" + VERSION_FILE="$CONF_DIR/java-version" +-JAVA_INSTALL_DIR="/usr/java" ++JAVA_INSTALL_DIR="/usr/lib64/openjdk-8" + JAVA_INSTALL_DIR_EXE="bin/java" +-JAVA_INSTALL_DIR2="/usr/lib/jvm" +-JAVA_INSTALL_DIR_EXE2="bin/java" +-JAVA_INSTALL_DIR3="/opt/ibm" +-JAVA_INSTALL_DIR_EXE3="jre/bin/java" + MIN_JAVA_VERSION="6" + + #Default conf values +-- +2.26.2 + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : projectlibre version : 1.9.1 -release : 4 +release : 5 source : - git|https://git.code.sf.net/p/projectlibre/code : a4f188f47459206c8c30219727f13f8ca2735cc7 homepage : https://www.projectlibre.com/ @@ -13,6 +13,8 @@ - apache-ant rundeps : - openjdk-8 +setup : | + %patch -p1 < $pkgfiles/Use-openjdk-8.patch build : | cd projectlibre_build ant dir diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -3,8 +3,8 @@ projectlibre https://www.projectlibre.com/ - Algent Albrahimi - algent@protonmail.com + Fabio Forni + livingsilver94.solus@redaril.me CPAL-1.0 office @@ -31,12 +31,12 @@ - - 2020-03-08 + + 2020-05-07 1.9.1 Packaging update - Algent Albrahimi - algent@protonmail.com + Fabio Forni + livingsilver94.solus@redaril.me \ No newline at end of file