update redhat packaging

OPM · Oct 30, 2017 · 5cc7078 · 5cc7078
1 parent 43277ca
commit 5cc7078
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/redhat/opm-parser.spec b/redhat/opm-parser.spec
@@ -2,21 +2,21 @@
 # spec file for package opm-parser
 #
 
-%define tag 0test0
+%define tag rc1
 
 Name:           opm-parser
-Version:        2016.10
+Version:        2017.10
 Release:        0
 Summary:        Open Porous Media - parser 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:  git suitesparse-devel doxygen bc opm-common-devel
-%{?el6:BuildRequires:  cmake28 devtoolset-3-toolchain boost148-devel}
-%{?!el6:BuildRequires:  cmake gcc gcc-gfortran gcc-c++ boost-devel}
-BuildRequires:  tinyxml-devel ert.ecl-devel
+BuildRequires:  git suitesparse-devel doxygen bc opm-common-devel devtoolset-6-toolchain 
+%{?el6:BuildRequires:  cmake28 boost148-devel}
+%{?!el6:BuildRequires:  cmake boost-devel}
+BuildRequires:  tinyxml-devel ecl-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       libopm-parser1 = %{version}
 
@@ -64,8 +64,8 @@ This package contains the applications for opm-parser
 
 # consider using -DUSE_VERSIONED_DIR=ON if backporting
 %build
-%{?el6:scl enable devtoolset-3 bash}
-%{?el6:cmake28} %{?!el6:cmake} -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo  -DSTRIP_DEBUGGING_SYMBOLS=ON -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_INSTALL_DOCDIR=share/doc/%{name}-%{version} -DUSE_RUNPATH=OFF %{?el6:-DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-3/root/usr/bin/g++ -DCMAKE_C_COMPILER=/opt/rh/devtoolset-3/root/usr/bin/gcc -DCMAKE_Fortran_COMPILER=/opt/rh/devtoolset-3/root/usr/bin/gfortran -DBOOST_LIBRARYDIR=%{_libdir}/boost148 -DBOOST_INCLUDEDIR=%{_includedir}/boost148}
+scl enable devtoolset-6 bash
+%{?el6:cmake3} %{?!el6:cmake} -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo  -DSTRIP_DEBUGGING_SYMBOLS=ON -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_INSTALL_DOCDIR=share/doc/%{name}-%{version} -DUSE_RUNPATH=OFF -DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/g++ -DCMAKE_C_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/gcc -DCMAKE_Fortran_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/gfortran %{?el6:-DBOOST_LIBRARYDIR=%{_libdir}/boost148 -DBOOST_INCLUDEDIR=%{_includedir}/boost148} -DBUILD_TESTING=0
 make
 
 %install
@@ -92,10 +92,10 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/libopm*.so
 %{_prefix}/lib/dunecontrol/*
-%{_libdir}/pkgconfig/*
+%{_prefix}/lib/cmake/*
+%{_prefix}/lib/pkgconfig/*
+%{_datadir}/opm-parser/*
 %{_includedir}/*
-%{_datadir}/cmake/*
-%{_datadir}/opm/*
 
 %files bin
 %{_bindir}/*