Merge remote-tracking branch 'origin/master' into release/2015.04

This commit is contained in:
Arne Morten Kvarving 2015-04-24 16:45:01 +02:00
commit 6affa99633

View File

@ -13,13 +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
BuildRequires: git suitesparse-devel cmake28 doxygen bc
BuildRequires: git suitesparse-devel cmake28 doxygen bc opm-parser-devel
BuildRequires: tinyxml-devel dune-istl-devel superlu-devel opm-core-devel
BuildRequires: opm-porsol-devel opm-material-devel ert.ecl-devel
BuildRequires: opm-porsol-devel opm-material-devel ert.ecl-devel boost148-devel
%{?el5:BuildRequires: gcc44 gcc44-gfortran gcc44-c++}
%{!?el5:BuildRequires: gcc gcc-gfortran gcc-c++}
%{?el5:BuildRequires: boost141-devel}
%{!?el5:BuildRequires: boost-devel}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libopm-upscaling1 = %{version}
@ -65,24 +63,12 @@ Requires: libopm-upscaling1 = %{version}
%description bin
This package contains the applications for opm-upscaling
%{?el5:
%package debuginfo
Summary: Debug info in opm-upscaling
Group: Scientific
Requires: %{name} = %{version}
Requires: libopm-upscaling1 = %{version}, opm-upscaling-bin = %{version}
BuildArch: %{_arch}
%description debuginfo
This package contains the debug symbols for opm-upscaling
}
%prep
%setup -q -n %{name}-release-%{version}-%{tag}
# consider using -DUSE_VERSIONED_DIR=ON if backporting
%build
cmake28 -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_INSTALL_DOCDIR=share/doc/%{name}-%{version} -DUSE_RUNPATH=OFF %{?el5:-DCMAKE_CXX_COMPILER=g++44 -DCMAKE_C_COMPILER=gcc44 -DCMAKE_Fortran_COMPILER=gfortran44 -DBOOST_LIBRARYDIR=%{_libdir}/boost141 -DBOOST_INCLUDEDIR=/usr/include/boost141}
cmake28 -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_INSTALL_DOCDIR=share/doc/%{name}-%{version} -DUSE_RUNPATH=OFF %{?el5:-DCMAKE_CXX_COMPILER=g++44 -DCMAKE_C_COMPILER=gcc44 -DCMAKE_Fortran_COMPILER=gfortran44} -DBOOST_LIBRARYDIR=%{_libdir}/boost148 -DBOOST_INCLUDEDIR=/usr/include/boost148
make
%install
@ -116,8 +102,3 @@ rm -rf %{buildroot}
%files bin
%{_bindir}/*
%{?el5:
%files debuginfo
/usr/lib/debug/%{_libdir}/*.so*.debug
}