Skip to content

Commit ed2f160

Browse files
committed
Improve JDK24 RPM Provides
1 parent a9902a5 commit ed2f160

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

linux_new/jdk/rhel/src/main/packaging/temurin/24/temurin-24-jdk.template.j2

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ Provides: %{altname}
8888
Obsoletes: java-24-temurin-jdk < 24.0.0.0.0.36-1
8989

9090
# Add Provides For Java Public Libraries
91-
Provides: libjawt.so
92-
Provides: libjava.so
93-
Provides: libjvm.so
94-
Provides: libverify.so
95-
Provides: libjsig.so
91+
Provides: libjawt.so%{?_isa}
92+
Provides: libjvm.so%{?_isa}
93+
Provides: libjava.so%{?_isa}
94+
Provides: libverify.so%{?_isa}
95+
Provides: libjsig.so%{?_isa}
9696

9797
# First architecture ({{ hardware_architecture }})
9898
Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK24U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz

linux_new/jdk/suse/src/main/packaging/temurin/24/temurin-24-jdk.template.j2

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ Provides: %{altname}
8888
Obsoletes: java-24-temurin-jdk < 24.0.0.0.0.36-1
8989

9090
# Add Provides For Java Public Libraries
91-
Provides: libjawt.so
92-
Provides: libjava.so
93-
Provides: libjvm.so
94-
Provides: libverify.so
95-
Provides: libjsig.so
91+
Provides: libjawt.so%{?_isa}
92+
Provides: libjvm.so%{?_isa}
93+
Provides: libjava.so%{?_isa}
94+
Provides: libverify.so%{?_isa}
95+
Provides: libjsig.so%{?_isa}
9696

9797
# First architecture ({{ hardware_architecture }})
9898
Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK24U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz

linux_new/jre/rhel/src/main/packaging/temurin/24/temurin-24-jre.template.j2

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ Provides: %{altname}
7878
Obsoletes: java-24-temurin-jre < 24.0.0.0.0.36-1
7979

8080
# Add Provides For Java Public Libraries
81-
Provides: libjawt.so
82-
Provides: libjava.so
83-
Provides: libjvm.so
84-
Provides: libverify.so
85-
Provides: libjsig.so
81+
Provides: libjawt.so%{?_isa}
82+
Provides: libjvm.so%{?_isa}
83+
Provides: libjava.so%{?_isa}
84+
Provides: libverify.so%{?_isa}
85+
Provides: libjsig.so%{?_isa}
8686

8787
# First architecture ({{ hardware_architecture }})
8888
Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK24U-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz

linux_new/jre/suse/src/main/packaging/temurin/24/temurin-24-jre.template.j2

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ Provides: %{altname}
7878
Obsoletes: java-24-temurin-jre < 24.0.0.0.0.36-1
7979

8080
# Add Provides For Java Public Libraries
81-
Provides: libjawt.so
82-
Provides: libjava.so
83-
Provides: libjvm.so
84-
Provides: libverify.so
85-
Provides: libjsig.so
81+
Provides: libjawt.so%{?_isa}
82+
Provides: libjvm.so%{?_isa}
83+
Provides: libjava.so%{?_isa}
84+
Provides: libverify.so%{?_isa}
85+
Provides: libjsig.so%{?_isa}
8686

8787
# First architecture ({{ hardware_architecture }})
8888
Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK24U-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz

0 commit comments

Comments
 (0)