From b11b94ca42a0e1408e42bbb3031995f1e01b0b65619f5061b6f0096baa9cbb18 Mon Sep 17 00:00:00 2001
From: Dmitry Roshchin <dmitry@roshchin.org>
Date: Thu, 13 Aug 2015 09:57:20 +0000
Subject: [PATCH] Accepting request 322318 from
 home:badshah400:branches:science

Add patch from upstream to fix compiling of C++ applications against v1.8.15

OBS-URL: https://build.opensuse.org/request/show/322318
OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=13
---
 hdf5-cpp-compilation-errors.patch | 18 ++++++++++++++++++
 hdf5.changes                      |  7 +++++++
 hdf5.spec                         |  7 +++++--
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 hdf5-cpp-compilation-errors.patch

diff --git a/hdf5-cpp-compilation-errors.patch b/hdf5-cpp-compilation-errors.patch
new file mode 100644
index 0000000..2811f00
--- /dev/null
+++ b/hdf5-cpp-compilation-errors.patch
@@ -0,0 +1,18 @@
+Index: src/H5api_adpt.h
+===================================================================
+--- src/H5api_adpt.h	(revision 26991)
++++ src/H5api_adpt.h	(revision 27474)
+@@ -21,13 +21,6 @@
+ #ifndef H5API_ADPT_H
+ #define H5API_ADPT_H
+ 
+-#ifdef __cplusplus
+-#define __attribute__(X)  /*void*/
+-#endif /* __cplusplus */
+-#ifndef H5_HAVE_ATTRIBUTE
+-#define __attribute__(X)  /*void*/
+-#endif /* H5_HAVE_ATTRIBUTE */
+-
+ /* This will only be defined if HDF5 was built with CMake */
+ #ifdef H5_BUILT_AS_DYNAMIC_LIB
+
diff --git a/hdf5.changes b/hdf5.changes
index 7ffd329..840abbd 100644
--- a/hdf5.changes
+++ b/hdf5.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug 13 07:42:07 UTC 2015 - badshah400@gmail.com
+
+- Add hdf5-cpp-compilation-errors.patch: Reverts a change from
+  v1.8.15 to H5api_adpt.h that caused compilation errors for C++
+  HDF5 applications; patch taken from upstream svn.
+
 -------------------------------------------------------------------
 Mon Jul 27 11:11:12 UTC 2015 - toddrme2178@gmail.com
 
diff --git a/hdf5.spec b/hdf5.spec
index f10ca3c..2979c84 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -44,6 +44,8 @@ Patch2:         hdf5-1.8.11-abort_unknown_host_config.patch
 Patch4:         hdf5-1.8.10-tests-arm.patch
 %endif
 Patch5:         hdf5-ldouble-ppc64le.patch
+# PATCH-FIX-UPSTREAM hdf5-cpp-compilation-errors.patch badshah400@gmail.com -- Reverted a change to the H5api_adpt.h that caused compilation errors for the C++ HDF5 applications; patch taken from upstream svn
+Patch6:         hdf5-cpp-compilation-errors.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
 %if 0%{?suse_version} > 1140
@@ -342,8 +344,8 @@ HDF5.
 %package openmpi-devel
 Summary:        Development files for %{name}-openmpi
 Group:          Development/Libraries/Parallel
-Requires:       %{name}-openmpi = %{version}
 Requires:       %{name}-devel-data = %{version}
+Requires:       %{name}-openmpi = %{version}
 # Required by Fortran programs?
 Requires:       %{libname}-%{sonum}-openmpi = %{version}
 Requires:       %{libname}_hl%{sonum}-openmpi = %{version}
@@ -372,8 +374,8 @@ the openmpi version of HDF5.
 %package mvapich2-devel
 Summary:        Development files for %{name}-mvapich2
 Group:          Development/Libraries/Parallel
-Requires:       %{name}-mvapich2 = %{version}
 Requires:       %{name}-devel-data = %{version}
+Requires:       %{name}-mvapich2 = %{version}
 # Required by Fortran programs?
 Requires:       %{libname}-%{sonum}-mvapich2 = %{version}
 Requires:       %{libname}_hl%{sonum}-mvapich2 = %{version}
@@ -512,6 +514,7 @@ test "%{sonum}" = "${LT_VERS_INTERFACE}" || exit 1
 %patch4 -p0 -b .tests-arm
 %endif
 %patch5 -p1
+%patch6 -p0
 
 echo "prepare parallel builds: %_mpi"
 for build_dir in build %_mpi; do