diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : kotlin-native version : 1.4.31 -release : 13 +release : 14 source : - https://github.com/JetBrains/kotlin-native/archive/1.4.31.tar.gz : 8198a7ed6dc99c5b71b194ddeb9d28f6cee1be74ae66b28e5358478bbb12502f - https://download.jetbrains.com/kotlin/native/clang-llvm-8.0.0-linux-x86-64.tar.gz : a9ebf55170bdbe5e089dbf884e0bc52065b5b7bc52e9354415e25a36e10e56c5 @@ -45,6 +45,7 @@ -Ptest.disable_update=true install : | install -Dm 00755 dist/bin/* -t $installdir/usr/share/kotlin-native/bin/ + rm $installdir/usr/share/kotlin-native/bin/kotlinc # deprecated upstream, conflicts with real kotlinc cp -r dist/{klib,konan,tools} $installdir/usr/share/kotlin-native/ sed -i "2r $pkgfiles/java-shim.txt" $installdir/usr/share/kotlin-native/bin/run_konan diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -30,7 +30,6 @@ /usr/bin/klib /usr/bin/konan-lldb /usr/bin/konanc - /usr/bin/kotlinc /usr/bin/kotlinc-native /usr/bin/run_konan /usr/share/kotlin-native/bin/cinterop @@ -39,7 +38,6 @@ /usr/share/kotlin-native/bin/klib /usr/share/kotlin-native/bin/konan-lldb /usr/share/kotlin-native/bin/konanc - /usr/share/kotlin-native/bin/kotlinc /usr/share/kotlin-native/bin/kotlinc-native /usr/share/kotlin-native/bin/run_konan /usr/share/kotlin-native/klib/common/org.jetbrains.kotlinx.kotlinx-cli/default/ir/bodies.knb @@ -2935,8 +2933,8 @@ - - 2021-02-27 + + 2021-03-17 1.4.31 Packaging update Campbell Jones