using openjdk-11

This commit is contained in:
Alexander Zhirov 2021-10-22 18:40:59 +03:00
parent df69d5af48
commit 9fc26f8906
3 changed files with 6 additions and 6 deletions

View File

@ -3,7 +3,7 @@
JAVA_OPTS="-Xmx512M -Dsun.net.inetaddr.ttl=60 -Djdk.gtk.version=2.2" JAVA_OPTS="-Xmx512M -Dsun.net.inetaddr.ttl=60 -Djdk.gtk.version=2.2"
if [ -z "$JAVA_HOME" ]; then if [ -z "$JAVA_HOME" ]; then
export JAVA_HOME=/usr/lib64/openjdk-8 export JAVA_HOME=/usr/lib64/openjdk-11
fi fi
if [ -z "$JAVA" ]; then if [ -z "$JAVA" ]; then

View File

@ -12,12 +12,12 @@ description: |
networking : true networking : true
builddeps : builddeps :
- apache-ant - apache-ant
- openjfx-8 - openjdk-11
- unzip - unzip
rundeps : rundeps :
- openjdk-8 - openjdk-11
build : | build : |
JAVA_HOME=/usr/lib64/openjdk-8 ant JAVA_HOME=/usr/lib64/openjdk-11 ant
install : | install : |
install -dm00644 $installdir/usr/share/davmail/lib install -dm00644 $installdir/usr/share/davmail/lib
unzip -q $(find dist/ -name "davmail-*-trunk.zip" -type f) -d source/ unzip -q $(find dist/ -name "davmail-*-trunk.zip" -type f) -d source/
@ -26,6 +26,6 @@ install : |
install -Dm00644 src/icon/davmail.png $installdir/usr/share/icons/hicolor/128x128/apps/davmail.png install -Dm00644 src/icon/davmail.png $installdir/usr/share/icons/hicolor/128x128/apps/davmail.png
install -Dm00644 src/desktop/davmail.desktop $installdir/usr/share/applications/davmail.desktop install -Dm00644 src/desktop/davmail.desktop $installdir/usr/share/applications/davmail.desktop
install -Dm00644 src/appstream/org.davmail.DavMail.appdata.xml $installdir/usr/share/metainfo/org.davmail.DavMail.appdata.xml install -Dm00644 src/appstream/org.davmail.DavMail.appdata.xml $installdir/usr/share/metainfo/org.davmail.DavMail.appdata.xml
# Install custom executable file with proper path of execute # Install custom executable file with proper path of execute
install -Dm00755 $pkgfiles/davmail $installdir/usr/bin/davmail install -Dm00755 $pkgfiles/davmail $installdir/usr/bin/davmail

View File

@ -50,7 +50,7 @@
</Package> </Package>
<History> <History>
<Update release="1"> <Update release="1">
<Date>2021-10-21</Date> <Date>2021-10-22</Date>
<Version>6.0.0</Version> <Version>6.0.0</Version>
<Comment>Packaging update</Comment> <Comment>Packaging update</Comment>
<Name>Alexander Zhirov</Name> <Name>Alexander Zhirov</Name>