Skip to content

Update JDK24 RPM File Names To Be temurin-24 rather than java-24 #1154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 28, 2025
Merged

Update JDK24 RPM File Names To Be temurin-24 rather than java-24 #1154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e010ed4
Change RPM Names To Temurin Prefix
steelhead31 Mar 26, 2025
35b69f9
Update RPM File Names
steelhead31 Mar 27, 2025
93f19fc
Change RPM Names To Temurin Prefix
steelhead31 Mar 26, 2025
0862478
Remove debug
steelhead31 Mar 27, 2025
f70c446
Merge branch 'rename_24_rpm' of https://github.com/steelhead31/instal…
steelhead31 Mar 27, 2025
35ff479
Remove whitespace
steelhead31 Mar 27, 2025
62937c2
Include Obsolete For DropIn Replacement
steelhead31 Mar 27, 2025
feb3376
Debug
steelhead31 Mar 27, 2025
9796a2e
Revert "Debug"
steelhead31 Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions linux_new/jdk/rhel/src/main/packaging/temurin/24/temurin-24-jdk.template.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
%global vers_arch {{ hardware_architecture }}
%global src_num 0
%global sha_src_num 1
%global altname temurin-24-jdk
%global altname java-24-temurin-jdk

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

AutoReqProv: no
Prefix: /usr/lib/jvm/%{name}
Prefix: /usr/lib/jvm/%{altname}

ExclusiveArch: {{ hardware_architecture }}

Expand Down Expand Up @@ -81,9 +81,12 @@ Provides: java-sdk-24
Provides: java-sdk-24-%{java_provides}
Provides: java-sdk-%{java_provides}

# Add Virtual Provide For Original Naming Format
# Add Virtual Provides For Altname
Provides: %{altname}

# Obsolete JDK24 v0 package due to naming
Obsoletes: java-24-temurin-jdk < 24.0.0.0.0.36-1

# Add Provides For Java Public Libraries
Provides: libjawt.so
Provides: libjava.so
Expand Down Expand Up @@ -120,13 +123,13 @@ popd
# noop

%install
if [ -L %{buildroot}/usr/lib/jvm/%{altname} ]; then
rm -f %{buildroot}/usr/lib/jvm/%{altname}
if [ -L %{buildroot}/usr/lib/jvm/%{name} ]; then
rm -f %{buildroot}/usr/lib/jvm/%{name}
fi
mkdir -p %{buildroot}%{prefix}
cd %{buildroot}%{prefix}
tar --strip-components=1 -C "%{buildroot}%{prefix}" -xf %{expand:%{SOURCE%{src_num}}}
ln -s %{prefix} %{buildroot}/usr/lib/jvm/%{altname}
ln -s %{prefix} %{buildroot}/usr/lib/jvm/%{name}

# Use cacerts included in OS
rm -f "%{buildroot}%{prefix}/lib/security/cacerts"
Expand Down Expand Up @@ -214,7 +217,7 @@ fi
%defattr(-,root,root)
%{prefix}
/usr/lib/tmpfiles.d/%{name}.conf
/usr/lib/jvm/%{altname}
/usr/lib/jvm/%{name}

%changelog
* {{ current_date }} Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org> {{ package_version }}-{{ package_release_version }}
Expand Down
19 changes: 11 additions & 8 deletions linux_new/jdk/suse/src/main/packaging/temurin/24/temurin-24-jdk.template.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
%global vers_arch {{ hardware_architecture }}
%global src_num 0
%global sha_src_num 1
%global altname temurin-24-jdk
%global altname java-24-temurin-jdk

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

AutoReqProv: no
Prefix: %{_libdir}/jvm/%{name}
Prefix: %{_libdir}/jvm/%{altname}

ExclusiveArch: {{ hardware_architecture }}

Expand Down Expand Up @@ -81,9 +81,12 @@ Provides: java-sdk-24
Provides: java-sdk-24-%{java_provides}
Provides: java-sdk-%{java_provides}

# Add Virtual Provide For Original Naming Format
# Add Virtual Provides For Altname
Provides: %{altname}

# Obsolete JDK24 v0 package due to naming
Obsoletes: java-24-temurin-jdk < 24.0.0.0.0.36-1

# Add Provides For Java Public Libraries
Provides: libjawt.so
Provides: libjava.so
Expand Down Expand Up @@ -114,13 +117,13 @@ popd
# noop

%install
if [ -L %{buildroot}%{_libdir}/jvm/%{altname} ]; then
rm -f %{buildroot}%{_libdir}/jvm/%{altname}
if [ -L %{buildroot}%{_libdir}/jvm/%{name} ]; then
rm -f %{buildroot}%{_libdir}/jvm/%{name}
fi
mkdir -p %{buildroot}%{prefix}
cd %{buildroot}%{prefix}
tar --strip-components=1 -C "%{buildroot}%{prefix}" -xf %{expand:%{SOURCE%{src_num}}}
ln -s %{prefix} %{buildroot}%{_libdir}/jvm/%{altname}
ln -s %{prefix} %{buildroot}%{_libdir}/jvm/%{name}

# Use cacerts included in OS
rm -f "%{buildroot}%{prefix}/lib/security/cacerts"
Expand Down Expand Up @@ -204,7 +207,7 @@ fi
%files
%defattr(-,root,root)
%{prefix}
%{_libdir}/jvm/%{altname}
%{_libdir}/jvm/%{name}

%changelog
* {{ current_date }} Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org> {{ package_version }}-{{ package_release_version }}
Expand Down
19 changes: 11 additions & 8 deletions linux_new/jre/rhel/src/main/packaging/temurin/24/temurin-24-jre.template.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
%global vers_arch {{ hardware_architecture }}
%global src_num 0
%global sha_src_num 1
%global altname temurin-24-jre
%global altname java-24-temurin-jre

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

AutoReqProv: no
Prefix: /usr/lib/jvm/%{name}
Prefix: /usr/lib/jvm/%{altname}

ExclusiveArch: {{ hardware_architecture }}

Expand Down Expand Up @@ -71,9 +71,12 @@ Provides: jre-headless
Provides: jre-%{java_provides}
Provides: jre-%{java_provides}-headless

# Add Virtual Provide For Original Naming Format
# Add Virtual Provides For Altname
Provides: %{altname}

# Obsolete JRE24 v0 package due to naming
Obsoletes: java-24-temurin-jre < 24.0.0.0.0.36-1

# Add Provides For Java Public Libraries
Provides: libjawt.so
Provides: libjava.so
Expand Down Expand Up @@ -110,13 +113,13 @@ popd
# noop

%install
if [ -L %{buildroot}/usr/lib/jvm/%{altname} ]; then
rm -f %{buildroot}/usr/lib/jvm/%{altname}
if [ -L %{buildroot}/usr/lib/jvm/%{name} ]; then
rm -f %{buildroot}/usr/lib/jvm/%{name}
fi
mkdir -p %{buildroot}%{prefix}
cd %{buildroot}%{prefix}
tar --strip-components=1 -C "%{buildroot}%{prefix}" -xf %{expand:%{SOURCE%{src_num}}}
ln -s %{prefix} %{buildroot}/usr/lib/jvm/%{altname}
ln -s %{prefix} %{buildroot}/usr/lib/jvm/%{name}

# Use cacerts included in OS
rm -f "%{buildroot}%{prefix}/lib/security/cacerts"
Expand Down Expand Up @@ -149,7 +152,7 @@ fi
%defattr(-,root,root)
%{prefix}
/usr/lib/tmpfiles.d/%{name}.conf
/usr/lib/jvm/%{altname}
/usr/lib/jvm/%{name}

%changelog
* {{ current_date }} Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org> {{ package_version }}-{{ package_release_version }}
Expand Down
19 changes: 11 additions & 8 deletions linux_new/jre/suse/src/main/packaging/temurin/24/temurin-24-jre.template.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
%global vers_arch {{ hardware_architecture }}
%global src_num 0
%global sha_src_num 1
%global altname temurin-24-jre
%global altname java-24-temurin-jre

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

AutoReqProv: no
Prefix: %{_libdir}/jvm/%{name}
Prefix: %{_libdir}/jvm/%{altname}

ExclusiveArch: {{ hardware_architecture }}

Expand Down Expand Up @@ -71,9 +71,12 @@ Provides: jre-headless
Provides: jre-%{java_provides}
Provides: jre-%{java_provides}-headless

# Add Virtual Provide For Original Naming Format
# Add Virtual Provides For Altname
Provides: %{altname}

# Obsolete JRE24 v0 package due to naming
Obsoletes: java-24-temurin-jre < 24.0.0.0.0.36-1

# Add Provides For Java Public Libraries
Provides: libjawt.so
Provides: libjava.so
Expand Down Expand Up @@ -104,13 +107,13 @@ popd
# noop

%install
if [ -L %{buildroot}%{_libdir}/jvm/%{altname} ]; then
rm -f %{buildroot}%{_libdir}/jvm/%{altname}
if [ -L %{buildroot}%{_libdir}/jvm/%{name} ]; then
rm -f %{buildroot}%{_libdir}/jvm/%{name}
fi
mkdir -p %{buildroot}%{prefix}
cd %{buildroot}%{prefix}
tar --strip-components=1 -C "%{buildroot}%{prefix}" -xf %{expand:%{SOURCE%{src_num}}}
ln -s %{prefix} %{buildroot}%{_libdir}/jvm/%{altname}
ln -s %{prefix} %{buildroot}%{_libdir}/jvm/%{name}

# Use cacerts included in OS
rm -f "%{buildroot}%{prefix}/lib/security/cacerts"
Expand Down Expand Up @@ -139,7 +142,7 @@ fi
%files
%defattr(-,root,root)
%{prefix}
%{_libdir}/jvm/%{altname}
%{_libdir}/jvm/%{name}

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