Skip to content

Commit 0d39fb4

Browse files
steelhead31jmjaffe37
steelhead31
authored and
jmjaffe37
committed
Update JDK24 RPM File Names To Be temurin-24 rather than java-24 (adoptium#1154)
* Change RPM Names To Temurin Prefix * Update RPM File Names * Change RPM Names To Temurin Prefix * Remove debug * Remove whitespace * Include Obsolete For DropIn Replacement * Debug * Revert "Debug" This reverts commit feb3376.
1 parent cf1aa4c commit 0d39fb4

File tree

4 files changed

+44
-32
lines changed

4 files changed

+44
-32
lines changed

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
%global vers_arch {{ hardware_architecture }}
2020
%global src_num 0
2121
%global sha_src_num 1
22-
%global altname temurin-24-jdk
22+
%global altname java-24-temurin-jdk
2323

24-
Name: java-24-temurin-jdk
24+
Name: temurin-24-jdk
2525
Version: %{spec_version}
2626
Release: %{spec_release}
2727
Summary: Eclipse Temurin 24 JDK
@@ -33,7 +33,7 @@ URL: https://projects.eclipse.org/projects/adoptium
3333
Packager: Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org>
3434

3535
AutoReqProv: no
36-
Prefix: /usr/lib/jvm/%{name}
36+
Prefix: /usr/lib/jvm/%{altname}
3737

3838
ExclusiveArch: {{ hardware_architecture }}
3939

@@ -81,9 +81,12 @@ Provides: java-sdk-24
8181
Provides: java-sdk-24-%{java_provides}
8282
Provides: java-sdk-%{java_provides}
8383

84-
# Add Virtual Provide For Original Naming Format
84+
# Add Virtual Provides For Altname
8585
Provides: %{altname}
8686

87+
# Obsolete JDK24 v0 package due to naming
88+
Obsoletes: java-24-temurin-jdk < 24.0.0.0.0.36-1
89+
8790
# Add Provides For Java Public Libraries
8891
Provides: libjawt.so
8992
Provides: libjava.so
@@ -120,13 +123,13 @@ popd
120123
# noop
121124

122125
%install
123-
if [ -L %{buildroot}/usr/lib/jvm/%{altname} ]; then
124-
rm -f %{buildroot}/usr/lib/jvm/%{altname}
126+
if [ -L %{buildroot}/usr/lib/jvm/%{name} ]; then
127+
rm -f %{buildroot}/usr/lib/jvm/%{name}
125128
fi
126129
mkdir -p %{buildroot}%{prefix}
127130
cd %{buildroot}%{prefix}
128131
tar --strip-components=1 -C "%{buildroot}%{prefix}" -xf %{expand:%{SOURCE%{src_num}}}
129-
ln -s %{prefix} %{buildroot}/usr/lib/jvm/%{altname}
132+
ln -s %{prefix} %{buildroot}/usr/lib/jvm/%{name}
130133

131134
# Use cacerts included in OS
132135
rm -f "%{buildroot}%{prefix}/lib/security/cacerts"
@@ -214,7 +217,7 @@ fi
214217
%defattr(-,root,root)
215218
%{prefix}
216219
/usr/lib/tmpfiles.d/%{name}.conf
217-
/usr/lib/jvm/%{altname}
220+
/usr/lib/jvm/%{name}
218221

219222
%changelog
220223
* {{ current_date }} Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org> {{ package_version }}-{{ package_release_version }}

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
%global vers_arch {{ hardware_architecture }}
2020
%global src_num 0
2121
%global sha_src_num 1
22-
%global altname temurin-24-jdk
22+
%global altname java-24-temurin-jdk
2323

24-
Name: java-24-temurin-jdk
24+
Name: temurin-24-jdk
2525
Version: %{spec_version}
2626
Release: %{spec_release}
2727
Summary: Eclipse Temurin 24 JDK
@@ -33,7 +33,7 @@ URL: https://projects.eclipse.org/projects/adoptium
3333
Packager: Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org>
3434

3535
AutoReqProv: no
36-
Prefix: %{_libdir}/jvm/%{name}
36+
Prefix: %{_libdir}/jvm/%{altname}
3737

3838
ExclusiveArch: {{ hardware_architecture }}
3939

@@ -81,9 +81,12 @@ Provides: java-sdk-24
8181
Provides: java-sdk-24-%{java_provides}
8282
Provides: java-sdk-%{java_provides}
8383

84-
# Add Virtual Provide For Original Naming Format
84+
# Add Virtual Provides For Altname
8585
Provides: %{altname}
8686

87+
# Obsolete JDK24 v0 package due to naming
88+
Obsoletes: java-24-temurin-jdk < 24.0.0.0.0.36-1
89+
8790
# Add Provides For Java Public Libraries
8891
Provides: libjawt.so
8992
Provides: libjava.so
@@ -114,13 +117,13 @@ popd
114117
# noop
115118

116119
%install
117-
if [ -L %{buildroot}%{_libdir}/jvm/%{altname} ]; then
118-
rm -f %{buildroot}%{_libdir}/jvm/%{altname}
120+
if [ -L %{buildroot}%{_libdir}/jvm/%{name} ]; then
121+
rm -f %{buildroot}%{_libdir}/jvm/%{name}
119122
fi
120123
mkdir -p %{buildroot}%{prefix}
121124
cd %{buildroot}%{prefix}
122125
tar --strip-components=1 -C "%{buildroot}%{prefix}" -xf %{expand:%{SOURCE%{src_num}}}
123-
ln -s %{prefix} %{buildroot}%{_libdir}/jvm/%{altname}
126+
ln -s %{prefix} %{buildroot}%{_libdir}/jvm/%{name}
124127

125128
# Use cacerts included in OS
126129
rm -f "%{buildroot}%{prefix}/lib/security/cacerts"
@@ -204,7 +207,7 @@ fi
204207
%files
205208
%defattr(-,root,root)
206209
%{prefix}
207-
%{_libdir}/jvm/%{altname}
210+
%{_libdir}/jvm/%{name}
208211

209212
%changelog
210213
* {{ current_date }} Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org> {{ package_version }}-{{ package_release_version }}

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
%global vers_arch {{ hardware_architecture }}
2020
%global src_num 0
2121
%global sha_src_num 1
22-
%global altname temurin-24-jre
22+
%global altname java-24-temurin-jre
2323

24-
Name: java-24-temurin-jre
24+
Name: temurin-24-jre
2525
Version: %{spec_version}
2626
Release: %{spec_release}
2727
Summary: Eclipse Temurin 24 JRE
@@ -33,7 +33,7 @@ URL: https://projects.eclipse.org/projects/adoptium
3333
Packager: Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org>
3434

3535
AutoReqProv: no
36-
Prefix: /usr/lib/jvm/%{name}
36+
Prefix: /usr/lib/jvm/%{altname}
3737

3838
ExclusiveArch: {{ hardware_architecture }}
3939

@@ -71,9 +71,12 @@ Provides: jre-headless
7171
Provides: jre-%{java_provides}
7272
Provides: jre-%{java_provides}-headless
7373

74-
# Add Virtual Provide For Original Naming Format
74+
# Add Virtual Provides For Altname
7575
Provides: %{altname}
7676

77+
# Obsolete JRE24 v0 package due to naming
78+
Obsoletes: java-24-temurin-jre < 24.0.0.0.0.36-1
79+
7780
# Add Provides For Java Public Libraries
7881
Provides: libjawt.so
7982
Provides: libjava.so
@@ -110,13 +113,13 @@ popd
110113
# noop
111114

112115
%install
113-
if [ -L %{buildroot}/usr/lib/jvm/%{altname} ]; then
114-
rm -f %{buildroot}/usr/lib/jvm/%{altname}
116+
if [ -L %{buildroot}/usr/lib/jvm/%{name} ]; then
117+
rm -f %{buildroot}/usr/lib/jvm/%{name}
115118
fi
116119
mkdir -p %{buildroot}%{prefix}
117120
cd %{buildroot}%{prefix}
118121
tar --strip-components=1 -C "%{buildroot}%{prefix}" -xf %{expand:%{SOURCE%{src_num}}}
119-
ln -s %{prefix} %{buildroot}/usr/lib/jvm/%{altname}
122+
ln -s %{prefix} %{buildroot}/usr/lib/jvm/%{name}
120123

121124
# Use cacerts included in OS
122125
rm -f "%{buildroot}%{prefix}/lib/security/cacerts"
@@ -149,7 +152,7 @@ fi
149152
%defattr(-,root,root)
150153
%{prefix}
151154
/usr/lib/tmpfiles.d/%{name}.conf
152-
/usr/lib/jvm/%{altname}
155+
/usr/lib/jvm/%{name}
153156

154157
%changelog
155158
* {{ current_date }} Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org> {{ package_version }}-{{ package_release_version }}

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
%global vers_arch {{ hardware_architecture }}
2020
%global src_num 0
2121
%global sha_src_num 1
22-
%global altname temurin-24-jre
22+
%global altname java-24-temurin-jre
2323

24-
Name: java-24-temurin-jre
24+
Name: temurin-24-jre
2525
Version: %{spec_version}
2626
Release: %{spec_release}
2727
Summary: Eclipse Temurin 24 JRE
@@ -33,7 +33,7 @@ URL: https://projects.eclipse.org/projects/adoptium
3333
Packager: Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org>
3434

3535
AutoReqProv: no
36-
Prefix: %{_libdir}/jvm/%{name}
36+
Prefix: %{_libdir}/jvm/%{altname}
3737

3838
ExclusiveArch: {{ hardware_architecture }}
3939

@@ -71,9 +71,12 @@ Provides: jre-headless
7171
Provides: jre-%{java_provides}
7272
Provides: jre-%{java_provides}-headless
7373

74-
# Add Virtual Provide For Original Naming Format
74+
# Add Virtual Provides For Altname
7575
Provides: %{altname}
7676

77+
# Obsolete JRE24 v0 package due to naming
78+
Obsoletes: java-24-temurin-jre < 24.0.0.0.0.36-1
79+
7780
# Add Provides For Java Public Libraries
7881
Provides: libjawt.so
7982
Provides: libjava.so
@@ -104,13 +107,13 @@ popd
104107
# noop
105108

106109
%install
107-
if [ -L %{buildroot}%{_libdir}/jvm/%{altname} ]; then
108-
rm -f %{buildroot}%{_libdir}/jvm/%{altname}
110+
if [ -L %{buildroot}%{_libdir}/jvm/%{name} ]; then
111+
rm -f %{buildroot}%{_libdir}/jvm/%{name}
109112
fi
110113
mkdir -p %{buildroot}%{prefix}
111114
cd %{buildroot}%{prefix}
112115
tar --strip-components=1 -C "%{buildroot}%{prefix}" -xf %{expand:%{SOURCE%{src_num}}}
113-
ln -s %{prefix} %{buildroot}%{_libdir}/jvm/%{altname}
116+
ln -s %{prefix} %{buildroot}%{_libdir}/jvm/%{name}
114117

115118
# Use cacerts included in OS
116119
rm -f "%{buildroot}%{prefix}/lib/security/cacerts"
@@ -139,7 +142,7 @@ fi
139142
%files
140143
%defattr(-,root,root)
141144
%{prefix}
142-
%{_libdir}/jvm/%{altname}
145+
%{_libdir}/jvm/%{name}
143146

144147
%changelog
145148
* {{ current_date }} Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org> {{ package_version }}-{{ package_release_version }}

0 commit comments

Comments
 (0)