diff --git a/debian/control b/debian/control index 1839b07..fd8aa4e 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Maintainer: Arne Morten Kvarving Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev, libboost-system-dev, libboost-date-time-dev, libboost-test-dev, 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, libecl-dev, git, zlib1g-dev, libtool, libopm-material-dev, libopm-grid-dev, libdune-grid-dev, libopm-output-dev, diff --git a/dune.module b/dune.module index e0d6d94..d65eec5 100644 --- a/dune.module +++ b/dune.module @@ -10,4 +10,4 @@ Label: 2018.04-pre Maintainer: arne.morten.kvarving@sintef.no MaintainerName: Arne Morten Kvarving 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 diff --git a/jenkins/build.sh b/jenkins/build.sh index df23a44..5e3ed37 100755 --- a/jenkins/build.sh +++ b/jenkins/build.sh @@ -6,15 +6,13 @@ upstreams=(opm-common opm-parser opm-output opm-material - opm-grid - opm-core) + opm-grid) declare -A upstreamRev upstreamRev[opm-common]=master upstreamRev[libecl]=master upstreamRev[opm-parser]=master upstreamRev[opm-material]=master -upstreamRev[opm-core]=master upstreamRev[opm-grid]=master upstreamRev[opm-output]=master diff --git a/opm-upscaling-prereqs.cmake b/opm-upscaling-prereqs.cmake index fa87dd8..f28e8e3 100644 --- a/opm-upscaling-prereqs.cmake +++ b/opm-upscaling-prereqs.cmake @@ -24,7 +24,6 @@ set (opm-upscaling_DEPS "dune-grid REQUIRED" "opm-common REQUIRED" "opm-grid REQUIRED" - "opm-core REQUIRED" "opm-output REQUIRED" ) diff --git a/redhat/opm-upscaling.spec b/redhat/opm-upscaling.spec index 1ade852..e8b4096 100644 --- a/redhat/opm-upscaling.spec +++ b/redhat/opm-upscaling.spec @@ -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 BuildRequires: blas-devel lapack-devel dune-common-devel opm-grid-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: devtoolset-6-toolchain %{?el6:BuildRequires: cmake3 boost148-devel}