From bf6ecd711848ab4f20fd0345648d078a69206917 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Sun, 21 Jan 2024 04:54:07 +0000
Subject: [PATCH] 18.1.2 Release

Resolves: RHEL-29882
---
 libomp.spec | 44 ++++++++++++++++++++++++++++++++++----------
 sources     |  4 ++--
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/libomp.spec b/libomp.spec
index 2a45ddb..3aeb20b 100644
--- a/libomp.spec
+++ b/libomp.spec
@@ -5,19 +5,24 @@
 %{llvm_sb}
 %endif
 
-%global maj_ver 17
-%global libomp_version %{maj_ver}.0.6
+%global maj_ver 18
+%global min_ver 1
+%global libomp_version %{maj_ver}.%{min_ver}.2
 #global rc_ver 4
 %global libomp_srcdir openmp-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src
-%global so_suffix %{maj_ver}
+%global so_suffix %{maj_ver}.%{min_ver}
 
 %if %{with snapshot_build}
 %undefine rc_ver
 %global maj_ver %{llvm_snapshot_version_major}
 %global libomp_version %{llvm_snapshot_version}
-%global so_suffix %{maj_ver}%{llvm_snapshot_version_suffix}
+%global so_suffix %{maj_ver}.%{min_ver}%{llvm_snapshot_version_suffix}
 %endif
 
+%global libomp_srcdir openmp-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src
+
+%global toolchain clang
+
 # Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer
 # https://bugzilla.redhat.com/show_bug.cgi?id=2158587
 %undefine _include_frame_pointers
@@ -29,7 +34,7 @@
 %endif
 
 Name: libomp
-Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}}
+Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
 Release: 1%{?dist}
 Summary: OpenMP runtime for clang
 
@@ -66,11 +71,6 @@ BuildRequires: llvm-cmake-utils
 
 Requires: elfutils-libelf%{?isa}
 
-Obsoletes: libomp-test < 17.0.3
-
-# libomp does not support s390x.
-ExcludeArch: s390x
-
 %description
 OpenMP runtime for clang.
 
@@ -131,14 +131,18 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 %endif
 %ifnarch %{ix86} %{arm}
 # libomptarget is not supported on 32-bit systems.
+# s390x does not support the offloading plugins.
+%ifnarch s390x
 %{_libdir}/libomptarget.rtl.amdgpu.so.%{so_suffix}
 %{_libdir}/libomptarget.rtl.cuda.so.%{so_suffix}
 %{_libdir}/libomptarget.rtl.%{libomp_arch}.so.%{so_suffix}
+%endif
 %{_libdir}/libomptarget.so.%{so_suffix}
 %endif
 
 %files devel
 %{_prefix}/lib/clang/%{maj_ver}/include/omp.h
+%{_prefix}/lib/clang/%{maj_ver}/include/ompx.h
 %ifnarch %{arm}
 %{_prefix}/lib/clang/%{maj_ver}/include/omp-tools.h
 %{_prefix}/lib/clang/%{maj_ver}/include/ompt.h
@@ -147,9 +151,12 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 %{_libdir}/cmake/openmp/FindOpenMPTarget.cmake
 %ifnarch %{ix86} %{arm}
 # libomptarget is not supported on 32-bit systems.
+# s390x does not support the offloading plugins.
+%ifnarch s390x
 %{_libdir}/libomptarget.rtl.amdgpu.so
 %{_libdir}/libomptarget.rtl.cuda.so
 %{_libdir}/libomptarget.rtl.%{libomp_arch}.so
+%endif
 %{_libdir}/libomptarget.devicertl.a
 %{_libdir}/libomptarget-amdgpu-*.bc
 %{_libdir}/libomptarget-nvptx-*.bc
@@ -157,6 +164,23 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 %endif
 
 %changelog
+* Fri Mar 22 2024 Tom Stellard <tstellar@redhat.com> - 18.1.2-1
+- 18.1.2 Release
+
+* Wed Mar 13 2024 Tom Stellard <tstellar@redhat.com> - 18.1.1-1
+- 18.1.1 Release
+
+* Thu Feb 29 2024 Tom Stellard <tstellar@redhat.com> - 18.1.0~rc4-1
+- 18.1.0-rc4 Release
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 17.0.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 17.0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+%{?llvm_snapshot_changelog_entry}
+
 * Wed Nov 29 2023 Nikita Popov <npopov@redhat.com> - 17.0.6-1
 - Update to LLVM 17.0.6
 
diff --git a/sources b/sources
index 10a82f6..d4bfd59 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (openmp-17.0.6.src.tar.xz) = 836c48db873e3da64835913c2c1d80efaebdfc7061f153acc7b478ea0d73b9c546a09d70dd1465e3e92684947c4a9cb197886b29cbd42418a778faa56b08cc5e
-SHA512 (openmp-17.0.6.src.tar.xz.sig) = 58fb951620d3494e016f0eeefb1cd28d86eb9ecc7894163ed96e8818573f6ed6b6f58d63884799fd052c943e5a63dec39193039f8499b99a55bfd8316c24a55f
+SHA512 (openmp-18.1.2.src.tar.xz) = 420129104082a3ab88fdb0a8cc168b2d488de0f6fae909f056a01ad4d845c73d360b7a9bc729624e86edbc679a9656a4bb1620c9b0b740f146be22a9a1bce019
+SHA512 (openmp-18.1.2.src.tar.xz.sig) = dc0cab3350d275f38f5137c96c7ce532a740a4f954dff031af22c1d55c4e5739b8e3c245c489c3e276eca65927a48c53df044ce5c288a743b05686f01ead4627