bump versions for 2017.10 final

update redhat packaging
bump debian packaging to 2017.10-rc1
2017-10-30 13:17:09 +01:00 · 2017-10-30 13:16:38 +01:00 · 2017-10-23 15:18:57 +02:00 · 2017-10-19 19:27:48 +02:00
3 changed files with 12 additions and 11 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,4 +1,4 @@
-opm-core (2013.10-2~precise) precise; urgency=low
+opm-core (2017.10-rfinal-1~xenial) xenial; urgency=low

  * New release

--- a/dune.module
+++ b/dune.module
@ -5,8 +5,8 @@

 Module: opm-core
 Description: Open Porous Media Initiative Core Library
-Version: 2017.10-pre
-Label: 2017.10-pre
+Version: 2017.10
+Label: 2017.10
 Maintainer: atgeirr@sintef.no
 MaintainerName: Atgeirr F. Rasmussen
 Url: http://opm-project.org
--- a/redhat/opm-core.spec
+++ b/redhat/opm-core.spec
@ -2,22 +2,23 @@
 # spec file for package opm-core
 #

-%define tag rc3
+%define tag final

 Name:           opm-core
-Version:        2013.10
+Version:        2017.10
 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 opm-grid-devel
 BuildRequires:  git suitesparse-devel doxygen bc opm-material-devel
-BuildRequires:  tinyxml-devel dune-istl-devel ert.ecl-devel opm-common-devel
+BuildRequires:  tinyxml-devel dune-istl-devel ecl-devel opm-common-devel
 BuildRequires:  opm-parser-devel opm-material-devel opm-output-devel
-%{?el6:BuildRequires:  cmake28 devtoolset-3-toolchain boost148-devel}
-%{?!el6:BuildRequires:  cmake gcc gcc-gfortran gcc-c++ boost-devel}
+BuildRequires:  devtoolset-6-toolchain 
+%{?el6:BuildRequires:  cmake3 boost148-devel}
+%{?!el6:BuildRequires:  cmake boost-devel}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       libopm-core1 = %{version}

@ -56,8 +57,8 @@ This package contains the documentation files for opm-core

 # 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 -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 -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 -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 -DCMAKE_Fortran_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/gfortran %{?el6:-DBOOST_LIBRARYDIR=%{_libdir}/boost148 -DBOOST_INCLUDEDIR=%{_includedir}/boost148}
 make

 %install
Author	SHA1	Message	Date
Arne Morten Kvarving	4529bd4eec	bump versions for 2017.10 final	2017-10-30 13:17:09 +01:00
Arne Morten Kvarving	ef408c3538	update redhat packaging	2017-10-30 13:16:38 +01:00
Arne Morten Kvarving	4d06ae5d00	bump debian packaging to 2017.10-rc1	2017-10-23 15:18:57 +02:00
Andreas Lauser	eece1c9c6b	change version to 2017.10-rc1	2017-10-19 19:27:48 +02:00