From bc3c58b3b9d08f4b94d02023dfb03db7bc56652a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 28 2020 11:52:36 +0000
Subject: import cmake-3.11.4-7.el8


---

diff --git a/SOURCES/0001-Remove-usage-of-list-JOIN.patch b/SOURCES/0001-Remove-usage-of-list-JOIN.patch
new file mode 100644
index 0000000..a97e41b
--- /dev/null
+++ b/SOURCES/0001-Remove-usage-of-list-JOIN.patch
@@ -0,0 +1,25 @@
+From 0480b1a5f6d18aee1430d7ebc7c1ae958f516d32 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Thu, 23 Jan 2020 09:05:01 -0800
+Subject: [PATCH] Remove usage of list(JOIN)
+
+---
+ Modules/FindMPI.cmake | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
+index 8632d7b..4816d6e 100644
+--- a/Modules/FindMPI.cmake
++++ b/Modules/FindMPI.cmake
+@@ -1677,7 +1677,7 @@ foreach(LANG IN ITEMS C CXX Fortran)
+     set(MPI_${LANG}_INCLUDE_PATH "${MPI_${LANG}_INCLUDE_DIRS}")
+     unset(MPI_${LANG}_COMPILE_FLAGS)
+     if(MPI_${LANG}_COMPILE_OPTIONS)
+-      list(JOIN MPI_${LANG}_COMPILE_OPTIONS " " MPI_${LANG}_COMPILE_FLAGS)
++      string(REPLACE ";" " " MPI_${LANG}_COMPILE_FLAGS "${MPI_${LANG}_COMPILE_OPTIONS}")
+     endif()
+     if(MPI_${LANG}_COMPILE_DEFINITIONS)
+       foreach(_MPI_DEF IN LISTS MPI_${LANG}_COMPILE_DEFINITIONS)
+-- 
+1.8.3.1
+
diff --git a/SPECS/cmake.spec b/SPECS/cmake.spec
index c3f04ea..632925a 100644
--- a/SPECS/cmake.spec
+++ b/SPECS/cmake.spec
@@ -63,7 +63,7 @@
 
 Name:           %{orig_name}%{?name_suffix}
 Version:        %{major_version}.%{minor_version}.4
-Release:        4%{?relsuf}%{?dist}
+Release:        7%{?relsuf}%{?dist}
 Summary:        Cross-platform make system
 
 # most sources are BSD
@@ -102,6 +102,7 @@ Patch103: cmake-libuv-location.patch
 # https://gitlab.kitware.com/cmake/cmake/issues/18349
 Patch104: 0001-FindMPI-Restore-MPI_-LANG-_COMPILE_FLAGS-as-a-comman.patch
 Patch105: 0001-FindMPI-Restore-MPI_-LANG-_COMPILE_FLAGS-and-MPI_-LA.patch
+Patch106: 0001-Remove-usage-of-list-JOIN.patch
 
 # Patch for renaming on EPEL
 %if 0%{?name_suffix:1}
@@ -516,6 +517,15 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Tue Jan 28 2020 Tom Stellard <tstellar@redhat.com> - 3.11.4-7
+- Fix test case name in dist-git
+
+* Fri Jan 24 2020 Tom Stellard <tstellar@redhat.com> - 3.11.4-6
+- Correctly fix mpi detection
+
+* Thu Jan 23 2020 Tom Stellard <tstellar@redhat.com> - 3.11.4-5
+- Remove usage of list(JOIN) from previous fix
+
 * Wed Nov 27 2019 Tom Stellard <tstellar@redhat.com> - 3.11.4-4
 - Fix bug with mpi detection