Page MenuHomeSolus
Files F11047930

D7702.id20766.diff
No OneTemporary
Actions

D7702.id20766.diff
View Options

diff --git a/files/0001-Default-to-openjdk-8.patch b/files/0001-Default-to-openjdk-8.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-Default-to-openjdk-8.patch
@@ -0,0 +1,25 @@
+From 51f887e550ea85a3189a120b8b77cdab2aefbdd7 Mon Sep 17 00:00:00 2001
+From: Fabio Forni <livingsilver94.solus@redaril.me>
+Date: Sun, 24 Nov 2019 01:40:42 +0100
+Subject: [PATCH] Default to openjdk-8
+
+---
+ apache-maven/src/bin/mvn | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
+index a554c66..c9dae7d 100755
+--- a/apache-maven/src/bin/mvn
++++ b/apache-maven/src/bin/mvn
+@@ -90,7 +90,7 @@ if $mingw ; then
+ fi
+
+ if [ -z "$JAVA_HOME" ] ; then
+- JAVACMD=`which java`
++ JAVACMD='/usr/lib64/openjdk-8/bin/java'
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+--
+2.24.0
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : apache-maven
version : 3.6.2
-release : 10
+release : 11
source :
- https://github.com/apache/maven/archive/maven-3.6.2.tar.gz : 9dfab7ff5c9f49201631512f9a8c5148f50ba92776dd2b86b36077bd7eefbf2e
license : Apache-2.0
@@ -13,13 +13,19 @@
- apache-maven
rundeps :
- openjdk-8
+setup : |
+ %patch -p1 < $pkgfiles/0001-Default-to-openjdk-8.patch
build : |
+ # Can be removed in release 12. This is just for bootstrapping
+ export JAVA_HOME=/usr/lib64/openjdk-8
+
mvn -DdistributionTargetDir=$installdir/usr/share/apache-maven -Dmaven.repo.local=../local-repo clean install
install : |
install -dm00755 $installdir/usr/bin
ln -s /usr/share/apache-maven/bin/mvn $installdir/usr/bin/mvn
ln -s /usr/share/apache-maven/bin/mvnDebug $installdir/usr/bin/mvnDebug
+ # Remove non-Linux files and legal stuff
find $installdir/usr/share/apache-maven \( -name 'README*' -o -iname '*license' -o -name NOTICE -o -name '*.cmd' \) -delete
- find $installdir/usr/share/apache-maven/lib/jansi-native -mindepth 1 -maxdepth 1 -type d -not -name linux64 | xargs rm -rf
+ find $installdir/usr/share/apache-maven/lib/jansi-native -mindepth 1 -maxdepth 1 -type d -not -name linux64 -exec rm -rfv {} +
rmdir $installdir/usr/share/apache-maven/lib/ext
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -74,8 +74,8 @@
</Files>
</Package>
<History>
- <Update release="10">
- <Date>2019-09-08</Date>
+ <Update release="11">
+ <Date>2019-11-24</Date>
<Version>3.6.2</Version>
<Comment>Packaging update</Comment>
<Name>Fabio Forni</Name>

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 3:57 PM (3 h, 4 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5790217
Default Alt Text
D7702.id20766.diff (2 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.