OilfieldToolsNet/opm-upscaling
4
0
Fork 0
mirror of https://github.com/OPM/opm-upscaling.git synced 2025-02-25 18:45:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove opm-core from upstream and prerequisite lists

Browse Source 
also update debian/redhat packaging
This commit is contained in:
Arne Morten Kvarving 2018-01-17 11:56:42 +01:00
parent 811bbceda1
commit ef279af858
5 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -4,7 +4,7 @@ Maintainer: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev, Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev,
libboost-system-dev, libboost-date-time-dev, libboost-test-dev, libboost-system-dev, libboost-date-time-dev, libboost-test-dev,
libsuperlu3-dev (>= 3.0) | libsuperlu-dev (>= 4.3), libsuperlu3-dev (>= 3.0) | libsuperlu-dev (>= 4.3),
gfortran, libsuitesparse-dev, libopm-core-dev, gfortran, libsuitesparse-dev,
libdune-common-dev, libdune-istl-dev, cmake, libtinyxml-dev, bc, libdune-common-dev, libdune-istl-dev, cmake, libtinyxml-dev, bc,
libecl-dev, git, zlib1g-dev, libtool, libopm-material-dev, libecl-dev, git, zlib1g-dev, libtool, libopm-material-dev,
libopm-grid-dev, libdune-grid-dev, libopm-output-dev, libopm-grid-dev, libdune-grid-dev, libopm-output-dev,

2
dune.module
View File

@ -10,4 +10,4 @@ Label: 2018.04-pre
Maintainer: arne.morten.kvarving@sintef.no Maintainer: arne.morten.kvarving@sintef.no
MaintainerName: Arne Morten Kvarving MaintainerName: Arne Morten Kvarving
Url: http://opm-project.org Url: http://opm-project.org
Depends: dune-common (>= 2.4) dune-grid (>= 2.4) dune-istl (>= 2.4) opm-parser opm-common opm-grid opm-core Depends: dune-common (>= 2.4) dune-grid (>= 2.4) dune-istl (>= 2.4) opm-parser opm-common opm-grid

4
jenkins/build.sh
View File

@ -6,15 +6,13 @@ upstreams=(opm-common
opm-parser opm-parser
opm-output opm-output
opm-material opm-material
opm-grid opm-grid)
opm-core)
declare -A upstreamRev declare -A upstreamRev
upstreamRev[opm-common]=master upstreamRev[opm-common]=master
upstreamRev[libecl]=master upstreamRev[libecl]=master
upstreamRev[opm-parser]=master upstreamRev[opm-parser]=master
upstreamRev[opm-material]=master upstreamRev[opm-material]=master
upstreamRev[opm-core]=master
upstreamRev[opm-grid]=master upstreamRev[opm-grid]=master
upstreamRev[opm-output]=master upstreamRev[opm-output]=master

1
opm-upscaling-prereqs.cmake
View File

@ -24,7 +24,6 @@ set (opm-upscaling_DEPS
"dune-grid REQUIRED" "dune-grid REQUIRED"
"opm-common REQUIRED" "opm-common REQUIRED"
"opm-grid REQUIRED" "opm-grid REQUIRED"
"opm-core REQUIRED"
"opm-output REQUIRED" "opm-output REQUIRED"
) )

2
redhat/opm-upscaling.spec
View File

@ -14,7 +14,7 @@ Url: http://www.opm-project.org/
Source0: https://github.com/OPM/%{name}/archive/release/%{version}/%{tag}.tar.gz#/%{name}-%{version}.tar.gz 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-grid-devel BuildRequires: blas-devel lapack-devel dune-common-devel opm-grid-devel
BuildRequires: git suitesparse-devel doxygen bc opm-parser-devel BuildRequires: git suitesparse-devel doxygen bc opm-parser-devel
BuildRequires: tinyxml-devel dune-istl-devel opm-common-devel opm-core-devel BuildRequires: tinyxml-devel dune-istl-devel opm-common-devel
BuildRequires: opm-material-devel ecl-devel opm-output-devel BuildRequires: opm-material-devel ecl-devel opm-output-devel
BuildRequires: devtoolset-6-toolchain BuildRequires: devtoolset-6-toolchain
%{?el6:BuildRequires: cmake3 boost148-devel} %{?el6:BuildRequires: cmake3 boost148-devel}