From 1b2ae1ee6434aebd8a220e1c59895f5d53c9772d Mon Sep 17 00:00:00 2001 From: windowsboy111 Date: Wed, 8 Feb 2023 21:15:02 +0800 Subject: [PATCH] fix: gradle --- anda/tools/gradle/gradle.spec | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/anda/tools/gradle/gradle.spec b/anda/tools/gradle/gradle.spec index c1d3466b2c..f460668046 100644 --- a/anda/tools/gradle/gradle.spec +++ b/anda/tools/gradle/gradle.spec @@ -1,14 +1,13 @@ Name: gradle -Version: 7.6.0 +Version: 7.6 Release: 1%{?dist} Summary: Powerful build system for the JVM URL: https://gradle.org/ -Source0: https://github.com/gradle/gradle/archive/refs/tags/v%{version}.tar.gz -Source2: https://raw.githubusercontent.com/gradle/gradle/v%{version}/LICENSE -Source3: https://raw.githubusercontent.com/gradle/gradle/v%{version}/README.md +Source0: https://services.gradle.org/distributions/%{name}-%{version}-src.zip +Source1: https://services.gradle.org/distributions/%{name}-%{version}-all.zip License: Apache-2.0 Requires: java-latest-openjdk coreutils findutils sed which bash -BuildRequires: java-11-openjdk asciidoc xmlto groovy +BuildRequires: java-11-openjdk-devel asciidoc xmlto groovy unzip git BuildArch: noarch Recommends: gradle-doc gradle-src @@ -30,11 +29,16 @@ Sources for gradle, a powerful build system for the JVM. # See PKGBUILD on Arch Linux %prep -%autosetup +unzip %{SOURCE1} %{name}-%{version}/{README,LICENSE} +mv %{name}-%{version}/README . +mv %{name}-%{version}/LICENSE . +rmdir %{name}-%{version} +unzip %{SOURCE0} +cd %{name}-%{version} -cat < gradle.sh +cat < dist/gradle.sh #!/bin/sh -export GRADLE_HOME=/usr/share/java/gradle +export GRADLE_HOME=%{buildroot}/usr/share/java/gradle EOF # remove ADOPTIUM contraint from all build related files @@ -44,11 +48,12 @@ sed -i '/JvmVendorSpec.ADOPTIUM/d' \ 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\:%{buildroot}/%{name}-%{version}-all.zip#" \ +sed -i "s#distributionUrl=.*#distributionUrl=file\:%{SOURCE1}#" \ gradle/wrapper/gradle-wrapper.properties %build +cd %{name}-%{version} export PATH="/usr/lib/jvm/java-11-openjdk/bin:${PATH}" ./gradlew installAll \ -Porg.gradle.java.installations.auto-download=false \ @@ -58,7 +63,7 @@ export PATH="/usr/lib/jvm/java-11-openjdk/bin:${PATH}" %install -cd dist +cd %{name}-%{version}/dist # install profile.d script install -Dm755 gradle.sh %{buildroot}/etc/profile.d/ @@ -98,19 +103,19 @@ install -Dm644 %{SOURCE3} %{buildroot}/%{_datadir}/doc/%{name}-src/ %files -%doc README.md +%doc README %license LICENSE /etc/profile.d/gradle.sh /usr/share/java/%{name}/ /usr/bin/%{name} %files doc -%doc README.md +%doc README %license LICENSE /usr/share/java/gradle/docs %files src -%doc README.md +%doc README %license LICENSE /usr/share/java/gradle/src