From b8cc88447c787ff9b0c0132ed8ea30f49b6ae9e0 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Oct 02 2019 22:27:14 +0000
Subject: drop cmake-3.11.4.patch to merged upstream


---

diff --git a/cmake-3.11.4.patch b/cmake-3.11.4.patch
deleted file mode 100644
index 380e052..0000000
--- a/cmake-3.11.4.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f97aee90fb7a53955f1056f8ed74fce1e6fee12f Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@votca.org>
-Date: Thu, 19 Sep 2019 16:54:41 -0600
-Subject: [PATCH] workaround for bug #1749463, cmake bug #18349
-
-Change-Id: I14c1c0a4f33f26b128d55baa1b0455f8a463a999
----
- cmake/gmxManageMPI.cmake | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/gmxManageMPI.cmake b/cmake/gmxManageMPI.cmake
-index 02db55732..daf06f12f 100644
---- a/cmake/gmxManageMPI.cmake
-+++ b/cmake/gmxManageMPI.cmake
-@@ -50,8 +50,17 @@ if(GMX_MPI)
-   if(NOT MPI_FOUND)
-       find_package(MPI)
-       if(MPI_C_FOUND)
--        set(MPI_COMPILE_FLAGS ${MPI_C_COMPILE_FLAGS})
--        set(MPI_LINKER_FLAGS ${MPI_C_LINK_FLAGS})
-+	# workaround for bug #1749463, cmake bug #18349
-+	# set(MPI_COMPILE_FLAGS ${MPI_C_COMPILE_FLAGS})
-+	# set(MPI_LINKER_FLAGS ${MPI_C_LINK_FLAGS})
-+	set(MPI_COMPILE_FLAGS)
-+	foreach(_MPI_FLAG ${MPI_C_COMPILE_FLAGS})
-+          set(MPI_COMPILE_FLAGS "${MPI_COMPILE_FLAGS} ${_MPI_FLAG}")
-+        endforeach()
-+	set(MPI_LINKER_FLAGS)
-+	foreach(_MPI_FLAG ${MPI_C_LINK_FLAGS})
-+          set(MPI_LINKER_FLAGS "${MPI_LINKER_FLAGS} ${_MPI_FLAG}")
-+        endforeach()
-         include_directories(SYSTEM ${MPI_C_INCLUDE_PATH})
-         list(APPEND GMX_COMMON_LIBRARIES ${MPI_C_LIBRARIES})
-       endif()
--- 
-2.21.0
-
diff --git a/gromacs.spec b/gromacs.spec
index 65236a3..a8e2b4d 100644
--- a/gromacs.spec
+++ b/gromacs.spec
@@ -48,8 +48,6 @@ Patch0:		gromacs-dssp-path.patch
 # enable some test on aarch64 - https://redmine.gromacs.org/issues/2366
 # bug#1558206
 Patch1:		gromacs-issue-2366.patch
-# workaround for bug #1749463, cmake bug #18349
-Patch2:         cmake-3.11.4.patch
 BuildRequires:	gcc-c++
 BuildRequires:  cmake3 >= 3.4.3
 BuildRequires:	openblas-devel
@@ -230,9 +228,6 @@ This package single and double precision binaries and libraries.
 %setup -q %{?SOURCE2:-a 2} -n gromacs-%{version}%{?_rc}
 %patch0 -p1
 %patch1 -p1
-%if 0%{?rhel} == 8
-%patch2 -p1
-%endif
 install -Dpm644 %{SOURCE1} ./serial/docs/manual/gromacs.pdf
 # Delete bundled stuff so that it doesn't get used accidentally
 # Don't remove tinyxml2 as gromacs needs an old version to build
@@ -374,6 +369,7 @@ done
 %changelog
 * Wed Oct 02 2019 Christoph Junghans <junghans@votca.org> - 2019.4-1
 - Version bump to 2019.4 (bug #1757694)
+- drop cmake-3.11.4.patch to merged upstream
 
 * Sun Aug 25 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2019.3-1.2
 - Rebuilt for hwloc-2.0