Merge pull request #1475 from akva2/master

update redhat packaging

redhat/opm-simulators.spec

@@ -2,20 +2,22 @@
 # spec file for package opm-simulators
 #
 
-%define tag rc1
+%define tag final
 
 Name:           opm-simulators
-Version:        2017.10
+Version:        2018.04
 Release:        0
 Summary:        Open Porous Media - core library
 License:        GPL-3.0
 Group:          Development/Libraries/C and C++
 Url:            http://www.opm-project.org/
 Source0:        https://github.com/OPM/%{name}/archive/release/%{version}/%{tag}.tar.gz#/%{name}-%{version}.tar.gz
-BuildRequires:  blas-devel lapack-devel dune-common-devel
+BuildRequires:  blas-devel lapack-devel dune-common-devel dune-geometry-devel
 BuildRequires:  git suitesparse-devel doxygen bc devtoolset-6-toolchain 
-BuildRequires:  opm-grid-devel
+BuildRequires:  opm-grid-devel opm-grid-openmpi-devel dune-grid-devel dune-localfunctions-devel
-BuildRequires:  tinyxml-devel dune-istl-devel eigen3-devel ecl-devel ewoms-devel
+BuildRequires:  ewoms-devel ewoms-openmpi-devel opm-common-devel opm-common-openmpi-devel
+BuildRequires:  opm-material-devel opm-material-openmpi-devel
+BuildRequires:  tinyxml-devel dune-istl-devel eigen3-devel ecl-devel
 BuildRequires:  openmpi-devel trilinos-openmpi-devel ptscotch-openmpi-devel scotch-devel
 %{?el6:BuildRequires: cmake3 boost148-devel}
 %{!?el6:BuildRequires: cmake boost-devel}
@@ -32,6 +34,13 @@ Group:          System/Libraries
 %description -n libopm-simulators1
 The Open Porous Media (OPM) initiative provides a set of open-source tools centered around the simulation of flow and transport of fluids in porous media. The goal of the initiative is to establish a sustainable environment for the development of an efficient and well-maintained software suite.
 
+%package -n libopm-simulators1-openmpi
+Summary:        Open Porous Media - automatic differentiation library
+Group:          System/Libraries
+
+%description -n libopm-simulators1-openmpi
+The Open Porous Media (OPM) initiative provides a set of open-source tools centered around the simulation of flow and transport of fluids in porous media. The goal of the initiative is to establish a sustainable environment for the development of an efficient and well-maintained software suite.
+
 %package devel
 Summary:        Development and header files for opm-simulators
 Group:          Development/Libraries/C and C++
@@ -40,6 +49,14 @@ Requires:       libopm-simulators1 = %{version}
 %description devel
 This package contains the development and header files for opm-simulators
 
+%package openmpi-devel
+Summary:        Development and header files for opm-simulators
+Group:          Development/Libraries/C and C++
+Requires:       libopm-simulators1-openmpi = %{version}
+
+%description openmpi-devel
+This package contains the development and header files for opm-simulators
+
 %package doc
 Summary:        Documentation files for opm-simulators
 Group:          Documentation
@@ -56,26 +73,51 @@ Requires:       libopm-simulators1 = %{version}
 %description bin
 This package contains the applications for opm-simulators
 
+%package openmpi-bin
+Summary:        Applications in opm-simulators
+Group:          Scientific
+Requires:       libopm-simulators1-openmpi = %{version}
+
+%description openmpi-bin
+This package contains the applications for opm-simulators
+
 %prep
 %setup -q -n %{name}-release-%{version}-%{tag}
 
 %build
 scl enable devtoolset-6 bash
+mkdir serial
+cd serial
+%{?el6:cmake3} %{?!el6:cmake} -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_INSTALL_DOCDIR=share/doc/%{name}-%{version} -DUSE_RUNPATH=OFF -DWITH_NATIVE=OFF -DUSE_QUADMATH=0 -DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/g++ -DCMAKE_C_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/gcc %{?el6:-DBOOST_LIBRARYDIR=%{_libdir}/boost148 -DBOOST_INCLUDEDIR=%{_includedir}/boost148} ..
+make
+make test
+cd ..
+
+mkdir openmpi
+cd openmpi
 %{?el6:module load openmpi-x86_64}
 %{?!el6:module load mpi/openmpi-x86_64}
-%{?el6:cmake3} %{?!el6:cmake} -DUSE_MPI=1 -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_INSTALL_DOCDIR=share/doc/%{name}-%{version} -DUSE_RUNPATH=OFF -DWITH_NATIVE=OFF -DUSE_QUADMATH=0 -DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/g++ -DCMAKE_C_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/gcc %{?el6:-DBOOST_LIBRARYDIR=%{_libdir}/boost148 -DBOOST_INCLUDEDIR=%{_includedir}/boost148} -DZOLTAN_ROOT=/usr/lib64/openmpi -DCMAKE_CXX_FLAGS=-I/usr/include/openmpi-x86_64/trilinos -DZOLTAN_INCLUDE_DIRS=/usr/include/openmpi-x86_64/trilinos -DPTSCOTCH_ROOT=/usr/lib64/openmpi -DPTSCOTCH_INCLUDE_DIR=/usr/include/openmpi-x86_64
+%{?el6:cmake3} %{?!el6:cmake} -DUSE_MPI=1 -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix}/lib64/openmpi -DCMAKE_INSTALL_DOCDIR=share/doc/%{name}-%{version} -DUSE_RUNPATH=OFF -DWITH_NATIVE=OFF -DUSE_QUADMATH=0 -DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/g++ -DCMAKE_C_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/gcc %{?el6:-DBOOST_LIBRARYDIR=%{_libdir}/boost148 -DBOOST_INCLUDEDIR=%{_includedir}/boost148} -DZOLTAN_ROOT=/usr/lib64/openmpi -DCMAKE_CXX_FLAGS=-I/usr/include/openmpi-x86_64/trilinos -DZOLTAN_INCLUDE_DIRS=/usr/include/openmpi-x86_64/trilinos -DPTSCOTCH_ROOT=/usr/lib64/openmpi -DPTSCOTCH_INCLUDE_DIR=/usr/include/openmpi-x86_64 ..
 make
+#make test
 
 %install
+cd serial
 make install DESTDIR=${RPM_BUILD_ROOT}
 make install-html DESTDIR=${RPM_BUILD_ROOT}
+cd ..
+cd openmpi
+make install DESTDIR=${RPM_BUILD_ROOT}
+mv ${RPM_BUILD_ROOT}/usr/lib64/openmpi/include/* ${RPM_BUILD_ROOT}/usr/include/openmpi-x86_64/
 
 %clean
 rm -rf %{buildroot}
 
 %post -n libopm-simulators1 -p /sbin/ldconfig
+%post -n libopm-simulators1-openmpi -p /sbin/ldconfig
 
 %postun -n libopm-simulators1 -p /sbin/ldconfig
+%postun -n libopm-simulators1-openmpi -p /sbin/ldconfig
 
 %files doc
 %{_docdir}/*
@@ -84,6 +126,10 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
 
+%files -n libopm-simulators1-openmpi
+%defattr(-,root,root,-)
+%{_libdir}/openmpi/lib64/*.so.*
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/*.so
@@ -93,5 +139,17 @@ rm -rf %{buildroot}
 %{_datadir}/cmake/*
 %{_datadir}/opm/cmake/Modules/*
 
+%files openmpi-devel
+%defattr(-,root,root,-)
+%{_libdir}/openmpi/lib64/*.so
+%{_libdir}/openmpi/lib/dunecontrol/*
+%{_libdir}/openmpi/lib64/pkgconfig/*
+%{_includedir}/openmpi-x86_64/*
+%{_libdir}/openmpi/share/cmake/*
+%{_libdir}/openmpi/share/opm/cmake/Modules/*
+
 %files bin
 %{_bindir}/*
+
+%files openmpi-bin
+%{_libdir}/openmpi/bin/*