From 0edf0d4aa146c5ddf0455c5d7f03cfdfe126ef18 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Thu, 5 Nov 2020 22:56:57 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/clang.git#5bff53b37b839e11cb3d227fdb3e7ecbf45e701b
---
 clang.spec             | 27 ++++++++++++++++++++++++++-
 tests/tests-libomp.yml |  2 ++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/clang.spec b/clang.spec
index 479ff9d..5f21d71 100644
--- a/clang.spec
+++ b/clang.spec
@@ -4,7 +4,7 @@
 %global min_ver 0
 %global patch_ver 0
 #%%global rc_ver 6
-%global baserelease 1
+%global baserelease 2
 
 %global clang_tools_binaries \
 	%{_bindir}/clang-apply-replacements \
@@ -51,6 +51,7 @@
 %else
 %global pkg_name clang
 %global install_prefix /usr
+%global pkg_libdir %{_libdir}
 %endif
 
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -173,6 +174,7 @@ as libraries and designed to be loosely-coupled and extensible.
 
 %package libs
 Summary: Runtime library for clang
+Requires: %{name}-resource-filesystem%{?_isa} = %{version}
 Recommends: compiler-rt%{?_isa} = %{version}
 # libomp-devel is required, so clang can find the omp.h header when compiling
 # with -fopenmp.
@@ -194,6 +196,13 @@ Requires: %{name}-libs = %{version}-%{release}
 %description devel
 Development header files for clang.
 
+%package resource-filesystem
+Summary: Filesystem package that owns the clang resource directory
+Provides: %{name}-resource-filesystem(major) = %{maj_ver}
+
+%description resource-filesystem
+This package owns the clang resouce directory: $libdir/clang/$version/
+
 %if !0%{?compat_build}
 %package analyzer
 Summary:	A source code analysis framework
@@ -407,6 +416,10 @@ pushd %{buildroot}%{_libdir}/clang/
 ln -s %{version} %{maj_ver}
 popd
 
+# Create sub-directories in the clang resource directory that will be
+# populated by other packages
+mkdir -p %{buildroot}%{_libdir}/clang/%{version}/{include,lib,share}/
+
 %endif
 
 # Remove clang-tidy headers.  We don't ship the libraries for these.
@@ -459,6 +472,15 @@ false
 %{pkg_libdir}/cmake/
 %endif
 
+%files resource-filesystem
+%dir %{pkg_libdir}/clang/%{version}/
+%dir %{pkg_libdir}/clang/%{version}/include/
+%dir %{pkg_libdir}/clang/%{version}/lib/
+%dir %{pkg_libdir}/clang/%{version}/share/
+%if !0%{?compat_build}
+%{pkg_libdir}/clang/%{maj_ver}
+%endif
+
 %if !0%{?compat_build}
 %files analyzer
 %{_bindir}/scan-view
@@ -495,6 +517,9 @@ false
 
 %endif
 %changelog
+* Wed Oct 28 2020 Tom Stellard <tstellar@redhat.com> - 11.0.0-2
+- Add clang-resource-filesystem sub-package
+
 * Thu Oct 15 2020 sguelton@redhat.com - 11.0.0-1
 - Fix NVR
 
diff --git a/tests/tests-libomp.yml b/tests/tests-libomp.yml
index b49702f..b43e4be 100644
--- a/tests/tests-libomp.yml
+++ b/tests/tests-libomp.yml
@@ -9,6 +9,8 @@
       with_items:
         - libomp
         - libomp-devel
+        - clang
+        - clang-libs
   roles:
   - role: standard-test-basic
     tags: