Page MenuHomeSolus

D8946.id21606.diff
No OneTemporary

D8946.id21606.diff

diff --git a/files/sbt.sh b/files/sbt.sh
--- a/files/sbt.sh
+++ b/files/sbt.sh
@@ -2,4 +2,4 @@
if [[ -z "${SBT_OPTS}" ]]; then
SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled"
fi
-java $SBT_OPTS -jar /usr/share/sbt/sbt-launch.jar "$@"
+/usr/lib64/openjdk-8/bin/java $SBT_OPTS -jar /usr/share/sbt/sbt.jar "$@"
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,22 +1,31 @@
name : sbt
-version : 1.0.2
-release : 5
+version : 1.3.10
+release : 6
source :
- - https://github.com/sbt/sbt/archive/v1.0.2.tar.gz : 175effc72923cc8bd58c7086c44d97c8c4fa272fec1551603e1ef4a07b1db033
-license : BSD-3-Clause
+ # sbt expects a git repository in order to be built.
+ - git|https://github.com/sbt/sbt.git : v1.3.10
+license : Apache-2.0
component : programming.tools
-summary : sbt is a build tool for Scala, Java, and more.
+summary : Build tool for Scala, Java, and more
description: |
sbt is a build tool for Scala, Java, and more.
builddeps :
- - openjdk-8
+ - openjdk-8 # Can be removed on the next release.
- sbt
+rundeps :
+ - openjdk-8
networking : yes
+setup : |
+ sed -e 's|-SNAPSHOT||g' -i build.sbt
build : |
- sed -i -e 's/-SNAPSHOT//g' build.sbt
- sbt -Dsbt.global.base=./.sbt/ -Dsbt.ivy.home=./.ivy2/ -Divy.home=./.ivy2/ package
+ # Can be removed on the next release.
+ export PATH="$PATH:/usr/lib64/openjdk-8/bin"
+
+ sbt -Divy.home=$workdir/.ivy2 \
+ -Dsbt.global.base=$workdir/.sbt \
+ -Dsbt.ivy.home=$workdir/.ivy2 \
+ -Duser.home=$workdir/.java \
+ package
install : |
- install -D -m 00755 $pkgfiles/sbt.sh $installdir/usr/share/sbt/sbt.sh
- install -D -m 00644 launch/target/sbt-launch.jar $installdir/usr/share/sbt/sbt-launch.jar
- install -d $installdir/usr/bin
- ln -s /usr/share/sbt/sbt.sh $installdir/usr/bin/sbt
+ install -Dm00755 $pkgfiles/sbt.sh $installdir/usr/bin/sbt
+ install -Dm00644 launch/target/sbt-launch.jar $installdir/usr/share/sbt/sbt.jar
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,34 +2,34 @@
<Source>
<Name>sbt</Name>
<Packager>
- <Name>René Vangsgaard</Name>
- <Email>rene.vangsgaard@gmail.com</Email>
+ <Name>Fabio Forni</Name>
+ <Email>livingsilver94.solus@redaril.me</Email>
</Packager>
- <License>BSD-3-Clause</License>
+ <License>Apache-2.0</License>
<PartOf>programming.tools</PartOf>
- <Summary xml:lang="en">sbt is a build tool for Scala, Java, and more.</Summary>
+ <Summary xml:lang="en">Build tool for Scala, Java, and more</Summary>
<Description xml:lang="en">sbt is a build tool for Scala, Java, and more.
</Description>
- <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+ <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
</Source>
<Package>
<Name>sbt</Name>
- <Summary xml:lang="en">sbt is a build tool for Scala, Java, and more.</Summary>
+ <Summary xml:lang="en">Build tool for Scala, Java, and more</Summary>
<Description xml:lang="en">sbt is a build tool for Scala, Java, and more.
</Description>
<PartOf>programming.tools</PartOf>
<Files>
- <Path fileType="executable">/usr/bin</Path>
- <Path fileType="data">/usr/share/sbt</Path>
+ <Path fileType="executable">/usr/bin/sbt</Path>
+ <Path fileType="data">/usr/share/sbt/sbt.jar</Path>
</Files>
</Package>
<History>
- <Update release="5">
- <Date>2017-09-24</Date>
- <Version>1.0.2</Version>
+ <Update release="6">
+ <Date>2020-05-24</Date>
+ <Version>1.3.10</Version>
<Comment>Packaging update</Comment>
- <Name>René Vangsgaard</Name>
- <Email>rene.vangsgaard@gmail.com</Email>
+ <Name>Fabio Forni</Name>
+ <Email>livingsilver94.solus@redaril.me</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Jun 12 2023, 9:45 AM (8 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5793712
Default Alt Text
D8946.id21606.diff (4 KB)

Event Timeline