From 34515bc9979ae265cf13f270a317863aaefd8104 Mon Sep 17 00:00:00 2001
From: Nikita Popov <npopov@redhat.com>
Date: Mon, 7 Nov 2022 10:25:17 +0100
Subject: [PATCH 1/2] Update to LLVM 15.0.4

---
 .gitignore  | 2 ++
 libomp.spec | 7 +++++--
 sources     | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index f287fee..9f2ef89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,3 +93,5 @@
 /openmp-14.0.5.src.tar.xz.sig
 /openmp-15.0.0.src.tar.xz
 /openmp-15.0.0.src.tar.xz.sig
+/openmp-15.0.4.src.tar.xz
+/openmp-15.0.4.src.tar.xz.sig
diff --git a/libomp.spec b/libomp.spec
index 723fabd..ee2fcb2 100644
--- a/libomp.spec
+++ b/libomp.spec
@@ -1,7 +1,7 @@
 %global toolchain clang
 
 %global maj_ver 15
-%global libomp_version %{maj_ver}.0.0
+%global libomp_version %{maj_ver}.0.4
 #global rc_ver 3
 %global libomp_srcdir openmp-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src
 
@@ -14,7 +14,7 @@
 
 Name: libomp
 Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: OpenMP runtime for clang
 
 License: NCSA
@@ -160,6 +160,9 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 %{_libexecdir}/tests/libomp/
 
 %changelog
+* Mon Nov 07 2022 Nikita Popov <npopov@redhat.com> - 15.0.4-1
+- Update to LLVM 15.0.4
+
 * Mon Sep 12 2022 Nikita Popov <npopov@redhat.com> - 15.0.0-3
 - Re-enable LTO build
 
diff --git a/sources b/sources
index 1290b5d..749158a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (openmp-15.0.0.src.tar.xz) = aa3c1be0a528c7b9cd5f97bfdb20efd9c6d2164d4de1a00ca81d542e91f456d760113c8698744a42bc87643d67464e6f650d71ae32b3b852a87637ba6a353531
-SHA512 (openmp-15.0.0.src.tar.xz.sig) = c4968040e1189e77c13150828f68b91e52d00fc46c0df54462b69afbff30b6ccb8a7920ff2125a3d49089e4bbbee38c9bd3fbe615c64f4edc54729e474973bcf
+SHA512 (openmp-15.0.4.src.tar.xz) = e87d2051721fd16ca21bbea8f365dc1874f308338320e003b62142006864c2d79d196f6d49c6fac0193d13a914e6ebe2d110b3313cabcfb961e667afb68b2b5b
+SHA512 (openmp-15.0.4.src.tar.xz.sig) = 0ec87f22f9d208b560a4d2ecb01587e0ff22afaa1db811e9f1557de9cb47d43025152f7464686b725927e143072699605670228d0d1b2af9a12694a77a6f4f2b

From 1f3202069bbbb3743c82dc433dce4a7e71794441 Mon Sep 17 00:00:00 2001
From: Jesus Checa Hidalgo <jchecahi@redhat.com>
Date: Mon, 12 Sep 2022 11:58:40 +0200
Subject: [PATCH 2/2] Migrate tests to tests/libomp repo

---
 tests/README.md        | 6 ++++++
 tests/build-gating.fmf | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 tests/README.md

diff --git a/tests/README.md b/tests/README.md
new file mode 100644
index 0000000..39c94b2
--- /dev/null
+++ b/tests/README.md
@@ -0,0 +1,6 @@
+# Gating testplans for libomp
+
+The tests for libomp are in a separate repo: https://src.fedoraproject.org/tests/libomp
+This directory should contain only fmf plans (such as build-gating.fmf) which import
+the tests from the tests repo. This can be done using the "url" parameter of the
+plan's "discover" step. Reference: https://tmt.readthedocs.io/en/stable/spec/plans.html#fmf
diff --git a/tests/build-gating.fmf b/tests/build-gating.fmf
index e1bd87c..61a3bf4 100644
--- a/tests/build-gating.fmf
+++ b/tests/build-gating.fmf
@@ -29,10 +29,14 @@ adjust:
     when: "collection == llvm-toolset-14.0"
 
 discover:
+    - name: libomp-tests
+      how: fmf
+      url: https://src.fedoraproject.org/tests/libomp.git
+      ref: main
     - name: upstream-llvm-integration-testsuite
       how: fmf
-      url: https://src.fedoraproject.org/rpms/llvm.git
-      ref: rawhide
+      url: https://src.fedoraproject.org/tests/llvm.git
+      ref: main
       test: integration-test-suite
 execute:
     how: tmt