From 5a98a0a7d0f87e23c1dd6c65d3f0ae59f1a876c0 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <rpm@greysector.net>
Date: Apr 04 2016 14:05:41 +0000
Subject: update to git master branch


- drop obsolete patches

---

diff --git a/.gitignore b/.gitignore
index 200ac23..6c0f3c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ manual-4.0.pdf
 /gromacs-5.1.1.tar.gz
 /manual-5.1.1.pdf
 /gromacs-bec9c8757e59cae58fc61ed841c0bb73c84079db.tar.gz
+/gromacs-d6e35c96ceeb552afeeec4655567af2945994958.tar.gz
diff --git a/gromacs-gtest-issue705.patch b/gromacs-gtest-issue705.patch
deleted file mode 100644
index f7a0f12..0000000
--- a/gromacs-gtest-issue705.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up gromacs-bec9c8757e59cae58fc61ed841c0bb73c84079db/cmake/gmxCFlags.cmake.gtest705 gromacs-bec9c8757e59cae58fc61ed841c0bb73c84079db/cmake/gmxCFlags.cmake
---- gromacs-bec9c8757e59cae58fc61ed841c0bb73c84079db/cmake/gmxCFlags.cmake.gtest705	2016-03-18 16:05:26.000000000 +0100
-+++ gromacs-bec9c8757e59cae58fc61ed841c0bb73c84079db/cmake/gmxCFlags.cmake	2016-03-21 19:37:46.623380637 +0100
-@@ -123,6 +123,9 @@ macro (gmx_c_flags)
-         GMX_TEST_CFLAG(CFLAGS_COPT "-funroll-all-loops"
-                        GMXC_CFLAGS_RELEASE)
-         GMX_TEST_CFLAG(CFLAGS_NOINLINE "-fno-inline" GMXC_CFLAGS_DEBUG)
-+        # Workaround GTest bug https://github.com/google/googletest/issues/705.
-+        GMX_TEST_CFLAG(CFLAGS_NO_DEL_NULL "-fno-delete-null-pointer-checks"
-+                       GMXC_CFLAGS_RELEASE)
-     endif()
-     # g++
-     if(CMAKE_COMPILER_IS_GNUCXX)
-@@ -142,6 +145,9 @@ macro (gmx_c_flags)
-         GMX_TEST_CXXFLAG(CXXFLAGS_COPT "-funroll-all-loops"
-                          GMXC_CXXFLAGS_RELEASE)
-         GMX_TEST_CXXFLAG(CXXFLAGS_NOINLINE "-fno-inline" GMXC_CXXFLAGS_DEBUG)
-+        # Workaround GTest bug https://github.com/google/googletest/issues/705.
-+        GMX_TEST_CXXFLAG(CXXFLAGS_NO_DEL_NULL "-fno-delete-null-pointer-checks"
-+                       GMXC_CXXFLAGS_RELEASE)
-     endif()
- 
-     # icc
diff --git a/gromacs-tests-i686.patch b/gromacs-tests-i686.patch
index d2957e3..735401e 100644
--- a/gromacs-tests-i686.patch
+++ b/gromacs-tests-i686.patch
@@ -5,7 +5,7 @@ diff -up gromacs-bec9c8757e59cae58fc61ed841c0bb73c84079db/src/gromacs/random/tes
      checker.checkSequence(result.begin(), result.end(), "TabulatedNormalDistribution16");
  }
  
-+/*
++#if 0
  TEST(TabulatedNormalDistributionTest, OutputDouble14)
  {
      gmx::test::TestReferenceData                  data;
@@ -13,24 +13,7 @@ diff -up gromacs-bec9c8757e59cae58fc61ed841c0bb73c84079db/src/gromacs/random/tes
      }
      checker.checkSequence(result.begin(), result.end(), "TabulatedNormalDistributionDouble14");
  }
-+*/
++#endif
  
  TEST(TabulatedNormalDistributionTest, Logical)
  {
-diff -up gromacs-bec9c8757e59cae58fc61ed841c0bb73c84079db/src/gromacs/simd/tests/scalar.cpp.i686 gromacs-bec9c8757e59cae58fc61ed841c0bb73c84079db/src/gromacs/simd/tests/scalar.cpp
---- gromacs-bec9c8757e59cae58fc61ed841c0bb73c84079db/src/gromacs/simd/tests/scalar.cpp.i686	2016-03-18 16:05:26.000000000 +0100
-+++ gromacs-bec9c8757e59cae58fc61ed841c0bb73c84079db/src/gromacs/simd/tests/scalar.cpp	2016-03-27 11:44:16.910357012 +0200
-@@ -279,11 +279,13 @@ TEST(SimdScalarTest, storeUI)
-     EXPECT_EQ(ref, val);
- }
- 
-+/*
- TEST(SimdScalarTest, andNotI)
- {
-     EXPECT_EQ(std::int32_t(0x0C0C0C0C),
-               andNot(std::int32_t(0xF0F0F0F0), std::int32_t(0xCCCCCCCC)));
- }
-+*/
- 
- TEST(SimdScalarTest, testBitsI)
- {
diff --git a/gromacs.spec b/gromacs.spec
index e010fe0..8bbf434 100644
--- a/gromacs.spec
+++ b/gromacs.spec
@@ -1,5 +1,5 @@
 %global git 1
-%global commit bec9c8757e59cae58fc61ed841c0bb73c84079db
+%global commit d6e35c96ceeb552afeeec4655567af2945994958
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 %ifnarch s390 s390x
@@ -42,7 +42,7 @@
 
 Name:		gromacs
 Version:	2016
-Release:	0.1.20160318git%{shortcommit}%{?dist}
+Release:	0.2.20160403git%{shortcommit}%{?dist}
 Summary:	Fast, Free and Flexible Molecular Dynamics
 License:	GPLv2+
 URL:		http://www.gromacs.org
@@ -65,9 +65,6 @@ Source6:	gromacs-README.fedora
 # fix path to packaged dssp
 # https://bugzilla.redhat.com/show_bug.cgi?id=1203754
 Patch0:		gromacs-dssp-path.patch
-# http://redmine.gromacs.org/issues/1911
-# https://github.com/google/googletest/issues/705
-Patch1:		gromacs-gtest-issue705.patch
 # use system lmfit
 Patch2:		gromacs-use-system-lmfit.patch
 # fix building documentation
@@ -294,7 +291,6 @@ install -Dpm644 %{SOURCE1} ./serial/docs/manual/manual.pdf
 %endif
 %patch0 -p1 -b .dssp
 %if 0%{?fedora} > 23
-%patch1 -p1 -b .gtest705
 %patch2 -p1 -b .lmfit
 rm -r src/external/lmfit
 %endif
@@ -531,6 +527,10 @@ done
 %{_bindir}/GMXRC.csh
 
 %changelog
+* Mon Apr 04 2016 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> - 2016-0.2.20160403gitd6e35c9
+- update to git master branch
+- drop obsolete patches
+
 * Fri Mar 18 2016 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> - 2016-0.1.20160318gitbec9c87
 - update to git master branch
 - disable OpenCL for now (due to pocl FTBFS #1307869)
diff --git a/sources b/sources
index ec82378..b5060b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-57240732fb260c0f7ee397a4a8362043  gromacs-bec9c8757e59cae58fc61ed841c0bb73c84079db.tar.gz
+3d4ccfc8080374c1b6cf0848f57590e1  gromacs-d6e35c96ceeb552afeeec4655567af2945994958.tar.gz