From fe9884efe70b54c87885f7c00eb5a42eb8f3e9f8 Mon Sep 17 00:00:00 2001
From: laokz <zhangkai@iscas.ac.cn>
Date: Wed, 19 Feb 2025 11:38:20 +0800
Subject: [PATCH] remove unused patch1

(cherry picked from commit 79a47b43e86c69a6b086e21df2bcc81b330811dd)
---
 02-use-riscv64-jdk.patch | 64 ----------------------------------------
 bazel.spec               |  7 +++--
 2 files changed, 4 insertions(+), 67 deletions(-)
 delete mode 100644 02-use-riscv64-jdk.patch

diff --git a/02-use-riscv64-jdk.patch b/02-use-riscv64-jdk.patch
deleted file mode 100644
index 58b16a9..0000000
--- a/02-use-riscv64-jdk.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE
-index a507f04..3be7b84 100755
---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE
-+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE
-@@ -83,6 +83,21 @@ maybe(
-     version = "11",
- )
- 
-+# This must be kept in sync with the top-level WORKSPACE file.
-+maybe(
-+    remote_java_repository,
-+    name = "remotejdk11_linux_riscv64",
-+    exec_compatible_with = [
-+        "@platforms//os:linux",
-+        "@platforms//cpu:riscv64",
-+    ],
-+    strip_prefix = "java-11-openjdk",
-+    urls = [
-+        "file:///build/bazel/src/remotejdk11_linux_riscv64.tar.gz",
-+    ],
-+    version = "11",
-+)
-+
- # This must be kept in sync with the top-level WORKSPACE file.
- maybe(
-     remote_java_repository,
-diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.tmpl b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.tmpl
-index 7040eae..b783308 100755
---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.tmpl
-+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.tmpl
-@@ -66,6 +66,21 @@ maybe(
-     version = "11",
- )
- 
-+# This must be kept in sync with the top-level WORKSPACE file.
-+maybe(
-+    remote_java_repository,
-+    name = "remotejdk11_linux_riscv64",
-+    exec_compatible_with = [
-+        "@platforms//os:linux",
-+        "@platforms//cpu:riscv64",
-+    ],
-+    strip_prefix = "java-11-openjdk",
-+    urls = [
-+        "file:///build/bazel/src/remotejdk11_linux_riscv64.tar.gz",
-+    ],
-+    version = "11",
-+)
-+
- # This must be kept in sync with the top-level WORKSPACE file.
- maybe(
-     remote_java_repository,
-diff --git a/tools/jdk/BUILD.tools b/tools/jdk/BUILD.tools
-index ecddfe0..85cb7b0 100755
---- a/tools/jdk/BUILD.tools
-+++ b/tools/jdk/BUILD.tools
-@@ -447,6 +447,7 @@ _JDKS = [
-     "remotejdk11_linux",
-     "remotejdk11_linux_ppc64le",
-     "remotejdk11_linux_s390x",
-+    "remotejdk11_linux_riscv64",
-     "remotejdk15_macos",
-     "remotejdk15_macos_aarch64",
-     "remotejdk15_win",
diff --git a/bazel.spec b/bazel.spec
index 39e266a..9ad6ad1 100644
--- a/bazel.spec
+++ b/bazel.spec
@@ -2,14 +2,13 @@
 
 Name:           bazel
 Version:        5.3.0
-Release:        2
+Release:        3
 Summary:        Correct, reproducible, and fast builds for everyone.
 License:        Apache License 2.0
 URL:            http://bazel.io/
 Source0:        https://github.com/bazelbuild/bazel/releases/download/%{version}/bazel-%{version}-dist.zip
 Source1:        abseil-cpp-riscv.patch
 Patch0:         01-fix-invalid-jni_md-select.patch
-Patch1:         02-use-riscv64-jdk.patch
 Patch2:         03-set-default-nojdk.patch
 Patch3:         linux-bazel-path-from-getauxval.patch
 Patch4:         04-riscv-distdir_deps.patch
@@ -32,7 +31,6 @@ Correct, reproducible, and fast builds for everyone.
 %prep
 %setup -q -c -n bazel-%{version}
 %patch0 -p1
-#%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %ifarch riscv64
@@ -99,6 +97,9 @@ env ./scripts/generate_bash_completion.sh --bazel=output/bazel --output=output/b
 %attr(0755,root,root) %{bashcompdir}/bazel
 
 %changelog
+* Wed Feb 19 2025 laokz  <zhangkai@iscas.ac.cn> - 5.3.0-3
+- remove unused patch1
+
 * Tue Jul 09 2024 laokz  <zhangkai@iscas.ac.cn> - 5.3.0-2
 - riscv64: fix 'rdcycle' SIGILL of dependency abseil-cpp
 
-- 
Gitee