Merge pull request #655 from akva2/updates_for_16.04_packaging

Updates for 16.04 packaging
This commit is contained in:
Atgeirr Flø Rasmussen 2016-04-18 11:49:36 +02:00
commit d9787f7593
8 changed files with 45 additions and 40 deletions

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
opm-autodiff (2013.10-2~precise) precise; urgency=low
opm-simulators (2013.10-2~precise) precise; urgency=low
* New release

34
debian/control vendored
View File

@ -1,4 +1,4 @@
Source: opm-autodiff
Source: opm-simulators
Priority: extra
Maintainer: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev,
@ -9,47 +9,51 @@ Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev,
texlive-latex-extra, texlive-latex-recommended, ghostscript,
libopm-core-dev, libeigen3-dev (>= 3.2.0), libopm-material-dev,
libopm-parser-dev, libboost-iostreams-dev, libopm-common-dev,
libdune-cornerpoint-dev, libdune-grid-dev, libug-dev
libopm-grid-dev, libdune-grid-dev, libug-dev, libopm-output-dev,
libtrilinos-zoltan-dev, libopenmpi-dev, mpi-default-bin
Standards-Version: 3.9.2
Section: libs
Homepage: http://opm-project.org
Vcs-Git: git://github.com/OPM/opm-autodiff.git
Vcs-Browser: https://github.com/OPM/opm-autodiff
Package: libopm-autodiff1-dev
Package: libopm-simulators1-dev
Section: libdevel
Architecture: any
Multi-Arch: foreign
Depends: libopm-autodiff1 (= ${binary:Version})
Provides: libopm-autodiff-dev
Suggests: libopm-autodiff1-doc
Description: OPM auto differentation library -- development files
Depends: libopm-simulators1 (= ${binary:Version})
Provides: libopm-simulators-dev
Suggests: libopm-simulators1-doc
Replaces: libopm-autodiff1-dev
Description: OPM simulators library -- development files
Utilities for automatic differentiation and simulators based on AD.
Package: libopm-autodiff1
Package: libopm-simulators1
Section: libs
Pre-Depends: ${misc:Pre-Depends}, multiarch-support
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: libopm-autodiff
Description: OPM auto differentation library
Provides: libopm-simulators
Description: OPM simulators library
Utilities for automatic differentiation and simulators based on AD.
Package: libopm-autodiff1-bin
Package: libopm-simulators1-bin
Section: science
Pre-Depends: ${misc:Pre-Depends}, multiarch-support
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: libopm-autodiff-bin
Provides: libopm-simulators-bin
Replaces: libopm-autodiff1-bin
Description: OPM auto differentation library -- applications
Utilities for automatic differentiation and simulators based on AD.
OPM Simulators.
Package: libopm-autodiff1-doc
Package: libopm-simulators1-doc
Section: doc
Architecture: all
Multi-Arch: foreign
Provides: libopm-autodiff-doc
Provides: libopm-simulators-doc
Replaces: libopm-autodiff1-doc
Description: OPM auto differentation library -- documentation
Utilities for automatic differentiation and simulators based on AD.

5
debian/rules vendored
View File

@ -8,6 +8,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
export OMPI_MCA_plm_rsh_agent=/bin/false
%:
dh $@
@ -20,10 +21,10 @@ override_dh_auto_build:
# consider using -DUSE_VERSIONED_DIR=ON if backporting
override_dh_auto_configure:
dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_DOCDIR=share/doc/libopm-autodiff1 -DWHOLE_PROG_OPTIM=OFF -DUSE_RUNPATH=OFF
dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=Release -DUSE_MPI=1 -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_DOCDIR=share/doc/libopm-simulators1 -DWHOLE_PROG_OPTIM=OFF -DUSE_RUNPATH=OFF
override_dh_auto_install:
dh_auto_install -- install-html
override_dh_installdocs:
dh_installdocs --link-doc=libopm-autodiff1
dh_installdocs --link-doc=libopm-simulators1

View File

@ -4,63 +4,63 @@
%define tag rc4
Name: opm-autodiff
Version: 2013.10
Name: opm-simulators
Version: 2015.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: git suitesparse-devel doxygen bc boost148-devel
BuildRequires: opm-parser-devel opm-core-devel dune-cornerpoint-devel
BuildRequires: blas-devel lapack-devel dune-common-devel opm-output-devel
BuildRequires: git suitesparse-devel doxygen bc
BuildRequires: opm-parser-devel opm-core-devel opm-grid-devel
BuildRequires: tinyxml-devel dune-istl-devel eigen3-devel ert.ecl-devel
%{?el6:BuildRequires: cmake28 devtoolset-2}
%{!?el6:BuildRequires: cmake gcc gcc-c++}
%{?el6:BuildRequires: cmake28 devtoolset-2 boost148-devel}
%{!?el6:BuildRequires: cmake gcc gcc-c++ boost-devel}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libopm-autodiff1 = %{version}
Requires: libopm-simulators1 = %{version}
%description
The Open Porous Media (OPM) initiative provides a set of open-source tools centered around the simulation of flow and transport of fluids in porous media. The goal of the initiative is to establish a sustainable environment for the development of an efficient and well-maintained software suite.
%package -n libopm-autodiff1
%package -n libopm-simulators1
Summary: Open Porous Media - automatic differentiation library
Group: System/Libraries
%description -n libopm-autodiff1
%description -n libopm-simulators1
The Open Porous Media (OPM) initiative provides a set of open-source tools centered around the simulation of flow and transport of fluids in porous media. The goal of the initiative is to establish a sustainable environment for the development of an efficient and well-maintained software suite.
%package devel
Summary: Development and header files for opm-autodiff
Summary: Development and header files for opm-simulators
Group: Development/Libraries/C and C++
Requires: libopm-autodiff1 = %{version}
Requires: libopm-simulators1 = %{version}
%description devel
This package contains the development and header files for opm-autodiff
This package contains the development and header files for opm-simulators
%package doc
Summary: Documentation files for opm-autodiff
Summary: Documentation files for opm-simulators
Group: Documentation
BuildArch: noarch
%description doc
This package contains the documentation files for opm-autodiff
This package contains the documentation files for opm-simulators
%package bin
Summary: Applications in opm-autodiff
Summary: Applications in opm-simulators
Group: Scientific
Requires: libopm-autodiff1 = %{version}
Requires: libopm-simulators1 = %{version}
%description bin
This package contains the applications for opm-autodiff
This package contains the applications for opm-simulators
%prep
%setup -q -n %{name}-release-%{version}-%{tag}
%build
%{?el6:scl enable devtoolset-2 bash}
%{?el6:cmake28} %{?!el6:cmake} -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_INSTALL_DOCDIR=share/doc/%{name}-%{version} -DUSE_RUNPATH=OFF %{?el6:-DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-2/root/usr/bin/g++ -DCMAKE_C_COMPILER=/opt/rh/devtoolset-2/root/usr/bin/gcc} -DBOOST_LIBRARYDIR=%{_libdir}/boost148 -DBOOST_INCLUDEDIR=/usr/include/boost148
%{?el6:cmake28} %{?!el6:cmake} -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_INSTALL_DOCDIR=share/doc/%{name}-%{version} -DUSE_RUNPATH=OFF %{?el6:-DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-2/root/usr/bin/g++ -DCMAKE_C_COMPILER=/opt/rh/devtoolset-2/root/usr/bin/gcc -DBOOST_LIBRARYDIR=%{_libdir}/boost148 -DBOOST_INCLUDEDIR=%{_includedir}/boost148}
make
%install
@ -70,14 +70,14 @@ make install-html DESTDIR=${RPM_BUILD_ROOT}
%clean
rm -rf %{buildroot}
%post -n libopm-autodiff1 -p /sbin/ldconfig
%post -n libopm-simulators1 -p /sbin/ldconfig
%postun -n libopm-autodiff1 -p /sbin/ldconfig
%postun -n libopm-simulators1 -p /sbin/ldconfig
%files doc
%{_docdir}/*
%files -n libopm-autodiff1
%files -n libopm-simulators1
%defattr(-,root,root,-)
%{_libdir}/*.so.*