From 5ee7a406f8b747e83967e80f5e131b8ab3077a68 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Mon, 27 Apr 2026 03:50:01 -0400 Subject: [PATCH] Revert OL modifications --- SOURCES/remove-intree-libraries.sh | 0 SPECS/java-17-openjdk.spec | 15 ++++++--------- 2 files changed, 6 insertions(+), 9 deletions(-) mode change 100755 => 100644 SOURCES/remove-intree-libraries.sh diff --git a/SOURCES/remove-intree-libraries.sh b/SOURCES/remove-intree-libraries.sh old mode 100755 new mode 100644 diff --git a/SPECS/java-17-openjdk.spec b/SPECS/java-17-openjdk.spec index 693a2fa..8d628fb 100644 --- a/SPECS/java-17-openjdk.spec +++ b/SPECS/java-17-openjdk.spec @@ -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 - 1:17.0.19.0.10-2.0.1 -- Add Oracle vendor bug URL [Orabug: 34340155] - * Mon Apr 20 2026 Thomas Fitzsimmons - 1:17.0.19.0.10-2 - Set rpmrelease to 2 for PQC signing