Revert OL modifications
This commit is contained in:
parent
802f8eabcd
commit
5ee7a406f8
0
SOURCES/remove-intree-libraries.sh
Executable file → Normal file
0
SOURCES/remove-intree-libraries.sh
Executable file → Normal file
@ -359,14 +359,10 @@
|
||||
%if 0%{?rhel}
|
||||
%global oj_vendor_bug_url https://access.redhat.com/support/cases/
|
||||
%else
|
||||
%if 0%{oraclelinux}
|
||||
%global oj_vendor_bug_url https://github.com/oracle/oracle-linux
|
||||
%else
|
||||
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
%global oj_vendor_version (Red_Hat-%{version}-%{portablerelease})
|
||||
|
||||
# Define IcedTea version used for SystemTap tapsets and desktop file
|
||||
@ -388,11 +384,15 @@
|
||||
%global top_level_dir_name %{vcstag}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
%global buildver 10
|
||||
%global rpmrelease 2.0.1
|
||||
%global rpmrelease 2
|
||||
# Settings used by the portable build
|
||||
%global portablerelease 1.0.1
|
||||
%global portablerelease 1
|
||||
# Portable suffix differs between RHEL and CentOS
|
||||
%if 0%{?centos} == 0
|
||||
%global portablesuffix el8
|
||||
%else
|
||||
%global portablesuffix el9
|
||||
%endif
|
||||
%global portablebuilddir /builddir/build/BUILD
|
||||
|
||||
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
|
||||
@ -2512,9 +2512,6 @@ cjc.mainProgram(args)
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Apr 24 2026 Darren Archibald <darren.archibald@oracle.com> - 1:17.0.19.0.10-2.0.1
|
||||
- Add Oracle vendor bug URL [Orabug: 34340155]
|
||||
|
||||
* Mon Apr 20 2026 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.19.0.10-2
|
||||
- Set rpmrelease to 2 for PQC signing
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user