From 26ea0ab459e6651f8ba5f337c1eec407ad2ac711 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 24 Apr 2015 15:23:26 +0200 Subject: [PATCH] update redhat packaging --- redhat/opm-autodiff.spec | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/redhat/opm-autodiff.spec b/redhat/opm-autodiff.spec index 503622482..7ce2a0d1e 100644 --- a/redhat/opm-autodiff.spec +++ b/redhat/opm-autodiff.spec @@ -13,12 +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 boost148-devel +BuildRequires: opm-parser-devel opm-core-devel dune-cornerpoint-devel BuildRequires: tinyxml-devel dune-istl-devel eigen3-devel ert.ecl-devel %{?el5:BuildRequires: gcc44 gcc44-c++} %{!?el5:BuildRequires: gcc gcc-c++} -%{?el5:BuildRequires: boost141-devel} -%{!?el5:BuildRequires: boost-devel} BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libopm-autodiff1 = %{version} @@ -59,22 +58,11 @@ Requires: libopm-autodiff1 = %{version} %description bin This package contains the applications for opm-autodiff -%{?el5: -%package debuginfo -Summary: Debug info in opm-autodiff -Group: Scientific -Requires: libopm-autodiff1 = %{version}, opm-autodiff-bin = %{version} -BuildArch: %{_arch} - -%description debuginfo -This package contains the debug symbols for opm-autodiff -} - %prep %setup -q -n %{name}-release-%{version}-%{tag} %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 -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} -DBOOST_LIBRARYDIR=%{_libdir}/boost148 -DBOOST_INCLUDEDIR=/usr/include/boost148 make %install @@ -105,8 +93,3 @@ rm -rf %{buildroot} %files bin %{_bindir}/* - -%{?el5: -%files debuginfo -/usr/lib/debug/%{_libdir}/*.so*.debug -}