From 22bc35f93e577b6b19ccbbd53e680b8b507622bc Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Feb 07 2017 23:18:18 +0000
Subject: Merge branch 'f24' into f25


---

diff --git a/.gitignore b/.gitignore
index 58f36dd..1a60e84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,5 @@ manual-4.0.pdf
 /manual-2016.pdf
 /gromacs-2016.1.tar.gz
 /manual-2016.1.pdf
+/gromacs-2016.2.tar.gz
+/manual-2016.2.pdf
diff --git a/gromacs-tng.patch b/gromacs-tng.patch
deleted file mode 100644
index e19029b..0000000
--- a/gromacs-tng.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 02922173c8d5f35f1d3730254eccf0621e55cbe7 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@votca.org>
-Date: Thu, 3 Nov 2016 12:12:17 -0600
-Subject: [PATCH] cmake: fix build with GMX_EXTERNAL_TNG=ON
-
-tng_set_source_properties is not defined in case of GMX_EXTERNAL_TNG=ON
-due to the fact that BuildTNG.cmake never gets included. Also this
-call isn't really needed tng doesn't get compile when external anyway.
-
-Change-Id: Id3c7e0da55ce9ef8cf43d2aecaa187e965bf6ad2
----
- src/gromacs/CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/gromacs/CMakeLists.txt b/src/gromacs/CMakeLists.txt
-index b7d9bf4..8b7fe3f 100644
---- a/src/gromacs/CMakeLists.txt
-+++ b/src/gromacs/CMakeLists.txt
-@@ -123,7 +123,9 @@ list(APPEND LIBGROMACS_SOURCES ${THREAD_MPI_SOURCES})
- 
- if(GMX_USE_TNG)
-     list(APPEND LIBGROMACS_SOURCES ${TNG_SOURCES})
--    tng_set_source_properties(WITH_ZLIB ${HAVE_ZLIB})
-+    if (NOT GMX_EXTERNAL_TNG)
-+        tng_set_source_properties(WITH_ZLIB ${HAVE_ZLIB})
-+    endif()
- endif()
- 
- get_lmfit_properties(LMFIT_SOURCES LMFIT_LIBRARIES_TO_LINK LMFIT_INCLUDE_DIRECTORY LMFIT_INCLUDE_DIR_ORDER)
--- 
-2.7.3
-
diff --git a/gromacs.spec b/gromacs.spec
index fe996a0..88d7f20 100644
--- a/gromacs.spec
+++ b/gromacs.spec
@@ -32,8 +32,8 @@
 %endif
 
 Name:		gromacs
-Version:	2016.1
-Release:	2%{?dist}
+Version:	2016.2
+Release:	1%{?dist}
 Summary:	Fast, Free and Flexible Molecular Dynamics
 License:	GPLv2+
 URL:		http://www.gromacs.org
@@ -58,11 +58,8 @@ Source6:	gromacs-README.fedora
 Patch0:		gromacs-dssp-path.patch
 # fix building documentation
 Patch3:		gromacs-sphinx-no-man.patch
-# Fix build with system TNG
-Patch8:		gromacs-tng.patch
 BuildRequires:	cmake
 BuildRequires:	atlas-devel >= 3.10.1
-BuildRequires:	boost-devel
 BuildRequires:	fftw-devel
 BuildRequires:	gsl-devel
 BuildRequires:	hwloc
@@ -242,7 +239,6 @@ This package single and double precision binaries and libraries.
 install -Dpm644 %{SOURCE1} ./serial/docs/manual/gromacs.pdf
 %endif
 %patch0 -p1 -b .dssp
-%patch8 -p1 -b .tng
 # Delete bundled stuff so that it doesn't get used accidentally
 rm -r src/external/{fftpack,tinyxml2,tng_io,lmfit}
 
@@ -460,6 +456,11 @@ done
 %{_libdir}/mpich/bin/mdrun_mpich*
 
 %changelog
+* Tue Feb 07 2017 Christoph Junghans <junghans@votca.org> - 2016.2-1
+- Update to 2016.2
+- Drop boost dependency, not uses anymore
+- Drop gromacs-tng.patch, made it upstream
+
 * Fri Dec 23 2016 Christoph Junghans <junghans@votca.org> - 2016.1-2
 - drop GMXRC* not needed when installed in /usr, drop zsh/csh package
 - fix location of bash-completion
diff --git a/sources b/sources
index 1b823d2..a008093 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0eba1a1fe6c5ace51a7ce2eaf6c1c7f2  gromacs-2016.1.tar.gz
-9bf68bb89315874ab3b5d0e1185abe81  manual-2016.1.pdf
+SHA512 (gromacs-2016.2.tar.gz) = f5e74bb8c126823c90d205ac0f0835e61fdd13a4550bc15aa9c972ee9b187f6451cdc90877c17276d2f889d61abb5eaa5ea1b54f7cbf3da67074146c749c1aa6
+SHA512 (manual-2016.2.pdf) = 7826adb48bfdee009f5cbc2ac4b64be6cd7e139d9704745edc8979d4e144415c835bf81ba171b057b577565a0d2eb3d379cb2fbc22a1cfef9aeb3b5e396d47ff