Merge branch 'frawhide' into mado/fix/gradle-1

Signed-off-by: madomado <madonuko@outlook.com>

anda/tools/buildsys/gradle/gradle.spec

@@ -3,11 +3,14 @@ Version:		8.14.3
 Release:		1%?dist
 Summary:		Powerful build system for the JVM
 URL:			https://gradle.org/
-Source0:		https://services.gradle.org/distributions/%{name}-%{version}-src.zip
+
-Source1:		https://services.gradle.org/distributions/%{name}-%{version}-all.zip
+%global v %(echo %version | sed -E 's@\.0$@@')
+
+Source0:		https://services.gradle.org/distributions/%{name}-%v-src.zip
+Source1:		https://services.gradle.org/distributions/%{name}-%v-all.zip
 License:		Apache-2.0
-Requires:		java-latest-openjdk coreutils findutils sed which bash
+Requires:		java-17-openjdk coreutils findutils sed which bash
-BuildRequires:	java-11-openjdk-devel asciidoc xmlto groovy unzip git
+BuildRequires:	java-17-openjdk-devel asciidoc xmlto groovy unzip git
 BuildArch:		noarch
 Recommends:		gradle-doc gradle-src
 
@@ -29,32 +32,29 @@ Sources for gradle, a powerful build system for the JVM.
 # See PKGBUILD on Arch Linux
 
 %prep
-unzip %{SOURCE1} %{name}-%{version}/{README,LICENSE}
+unzip %{S:1} %name-%v/{README,LICENSE}
-mv %{name}-%{version}/README .
-mv %{name}-%{version}/LICENSE .
-rmdir %{name}-%{version}
-unzip %{SOURCE0}
-cd %{name}-%{version}
 
+%global buildsubdir %name-%v
+
+mv %name-%v/README .
+mv %name-%v/LICENSE .
+rmdir %name-%v
+unzip %{S:0}
+cd %name-%v
+
+mkdir dist
 cat <<EOF > dist/gradle.sh
 #!/bin/sh
 export GRADLE_HOME=/usr/share/java/gradle
 EOF
 
-# remove ADOPTIUM contraint from all build related files
-sed -i '/JvmVendorSpec.ADOPTIUM/d' \
-	build-logic/jvm/src/main/kotlin/gradlebuild.unittest-and-compile.gradle.kts \
-	subprojects/docs/src/snippets/java/toolchain-filters/groovy/build.gradle \
-	subprojects/docs/src/snippets/java/toolchain-filters/kotlin/build.gradle.kts \
-	build-logic-commons/gradle-plugin/src/main/kotlin/common.kt
 # inhibit automatic download of binary gradle
 sed -i "s#distributionUrl=.*#distributionUrl=file\:%{SOURCE1}#" \
 	gradle/wrapper/gradle-wrapper.properties
 
 
 %build
-cd %{name}-%{version}
+export PATH="/usr/lib/jvm/java-latest-openjdk/bin:${PATH}"
-export PATH="/usr/lib/jvm/java-11-openjdk/bin:${PATH}"
 ./gradlew installAll \
 	-Porg.gradle.java.installations.auto-download=false \
 	-PfinalRelease=true \
@@ -63,7 +63,7 @@ export PATH="/usr/lib/jvm/java-11-openjdk/bin:${PATH}"
 
 
 %install
-cd %{name}-%{version}/dist
+cd dist
 
 # install profile.d script
 install -Dm755 gradle.sh %{buildroot}/etc/profile.d/