diff --git a/redhat/opm-simulators.spec b/redhat/opm-simulators.spec index 3581b1ac7..363913d00 100644 --- a/redhat/opm-simulators.spec +++ b/redhat/opm-simulators.spec @@ -2,10 +2,10 @@ # spec file for package opm-autodiff # -%define tag rc4 +%define tag rc1 Name: opm-simulators -Version: 2015.10 +Version: 2017.10 Release: 0 Summary: Open Porous Media - core library License: GPL-3.0 @@ -13,11 +13,11 @@ 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 opm-output-devel -BuildRequires: git suitesparse-devel doxygen bc +BuildRequires: git suitesparse-devel doxygen bc devtoolset-6-toolchain BuildRequires: opm-parser-devel opm-core-devel opm-grid-devel -BuildRequires: tinyxml-devel dune-istl-devel eigen3-devel ert.ecl-devel ewoms-devel -%{?el6:BuildRequires: cmake28 devtoolset-3-toolchain boost148-devel} -%{!?el6:BuildRequires: cmake gcc gcc-c++ boost-devel} +BuildRequires: tinyxml-devel dune-istl-devel eigen3-devel ecl-devel ewoms-devel +%{?el6:BuildRequires: cmake3 boost148-devel} +%{!?el6:BuildRequires: cmake boost-devel} BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libopm-simulators1 = %{version} @@ -59,8 +59,8 @@ This package contains the applications for opm-simulators %setup -q -n %{name}-release-%{version}-%{tag} %build -%{?el6:scl enable devtoolset-3 bash} -%{?el6:cmake28} %{?!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 %{?el6:-DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-3/root/usr/bin/g++ -DCMAKE_C_COMPILER=/opt/rh/devtoolset-3/root/usr/bin/gcc -DBOOST_LIBRARYDIR=%{_libdir}/boost148 -DBOOST_INCLUDEDIR=%{_includedir}/boost148} +scl enable devtoolset-6 bash +%{?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 -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 %install