Skip to content
Snippets Groups Projects
Commit bb87ccd8 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Merge branch 'pkg/release-v5.6.0' into 'master'

Update VERSION and fix packaging issues.

See merge request !1805
parents 7cc09331 02ab2998
No related branches found
No related tags found
No related merge requests found
5.5.0
5.6.0
......@@ -23,7 +23,7 @@ RUN DEBIAN_RELEASE=bookworm && \
libtinyxml-dev \
mpi-default-dev \
zlib1g-dev \
python3-dev python3-numpy \
python3-dev python3-numpy python3-pip python3-setuptools \
libptscotch-dev \
liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev libgl-dev \
libtet1.5-dev libtriangle-dev \
......
......@@ -23,7 +23,7 @@ RUN DEBIAN_RELEASE=bullseye && \
libtinyxml-dev \
mpi-default-dev \
zlib1g-dev \
python3-dev python3-numpy \
python3-dev python3-numpy python3-pip python3-setuptools \
libptscotch-dev \
liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev libgl-dev \
libtet1.5-dev libtriangle-dev \
......
......@@ -23,7 +23,7 @@ RUN DEBIAN_RELEASE=buster && \
libtinyxml-dev \
mpi-default-dev \
zlib1g-dev \
python3-dev python3-numpy \
python3-dev python3-numpy python3-pip python3-setuptools \
libptscotch-dev \
liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev libgl-dev \
libtet1.5-dev libtriangle-dev \
......
......@@ -21,7 +21,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libtinyxml-dev \
mpi-default-dev \
zlib1g-dev \
python3-dev python3-numpy \
python3-dev python3-numpy python3-pip python3-setuptools \
libptscotch-dev \
liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev libgl-dev \
libtet1.5-dev libtriangle-dev \
......
......@@ -21,7 +21,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libtinyxml-dev \
mpi-default-dev \
zlib1g-dev \
python3-dev python3-numpy \
python3-dev python3-numpy python3-pip python3-setuptools \
libptscotch-dev \
liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev libgl-dev \
libtet1.5-dev libtriangle-dev \
......
......@@ -21,7 +21,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libtinyxml-dev \
mpi-default-dev \
zlib1g-dev \
python3-dev python3-numpy \
python3-dev python3-numpy python3-pip python3-setuptools \
libptscotch-dev \
liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev libgl-dev \
libtet1.5-dev libtriangle-dev \
......
nektar++ (5.6.0-1) unstable; urgency=medium
* New upstream release.
-- Chris Cantwell <c.cantwell@imperial.ac.uk> Tue, 14 May 2024 08:29:00 +0100
nektar++ (5.5.0-1) unstable; urgency=medium
* New upstream release.
......
......@@ -22,6 +22,8 @@ BuildRequires: make
BuildRequires: opencascade-devel
#BuildRequires: petsc-devel
BuildRequires: python3-devel
BuildRequires: python3-pip
BuildRequires: python3-setuptools
BuildRequires: scotch-devel
BuildRequires: tetgen-devel
BuildRequires: tinyxml-devel
......@@ -108,6 +110,8 @@ Requires: make
Requires: opencascade-devel
#Requires: petsc-devel
Requires: python3-devel
Requires: python3-pip
Requires: python3-setuptools
Requires: scotch-devel
Requires: tetgen-devel
Requires: tinyxml-devel
......@@ -133,6 +137,8 @@ Requires: opencascade-devel
#Requires: petsc-openmpi-devel
Requires: hdf5-openmpi-devel
Requires: python3-devel
Requires: python3-pip
Requires: python3-setuptools
Requires: ptscotch-openmpi-devel
Requires: tetgen-devel
Requires: tinyxml-devel
......@@ -158,6 +164,8 @@ Requires: opencascade-devel
#Requires: petsc-mpich-devel
Requires: hdf5-mpich-devel
Requires: python3-devel
Requires: python3-pip
Requires: python3-setuptools
Requires: ptscotch-mpich-devel
Requires: tetgen-devel
Requires: tinyxml-devel
......@@ -456,9 +464,9 @@ MPI_ON=ON NEKTAR_LIBDIR=lib NEKTAR_INCLUDE_ROOT=%{_prefix}/include/$MPI_COMPILER
make -C serial install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p"
# Install serial NekPy library
cd serial
cd serial/python
%{__python3} setup.py install --root=%{buildroot} --install-purelib=%{python3_sitearch}
cd ..
cd ../..
# Make sure module paths are loaded, again.
. /etc/profile.d/modules.sh;
......@@ -467,18 +475,20 @@ cd ..
%{_openmpi_load}
cd $MPI_COMPILER
make install DESTDIR=%{buildroot}
cd python
%{__python3} setup.py install --root=%{buildroot} --install-purelib=%{python3_sitearch}/openmpi
mv %{buildroot}/usr/lib64/openmpi/include %{buildroot}/usr/include/$MPI_COMPILER
cd ..
cd ../..
%{_openmpi_unload}
# Install MPICH version
%{_mpich_load}
cd $MPI_COMPILER
make install DESTDIR=%{buildroot}
cd python
%{__python3} setup.py install --root=%{buildroot} --install-purelib=%{python3_sitearch}/mpich
mv %{buildroot}/usr/lib64/mpich/include %{buildroot}/usr/include/$MPI_COMPILER
cd ..
cd ../..
%{_mpich_unload}
# Clean up temporary Python files
......
......@@ -18,8 +18,8 @@ Build-Depends: cmake (>= 2.8.11),
libptscotch-dev,
libtinyxml-dev,
mpi-default-dev,
python-pip,
python-setuptools,
python3-pip,
python3-setuptools,
zlib1g-dev
Package: libnektar++
......
......@@ -18,8 +18,8 @@ Build-Depends: cmake (>= 2.8.11),
libptscotch-dev,
libtinyxml-dev,
mpi-default-dev,
python-pip,
python-setuptools,
python3-pip,
python3-setuptools,
zlib1g-dev
Package: libnektar++
......
......@@ -18,8 +18,8 @@ Build-Depends: cmake (>= 2.8.11),
libptscotch-dev,
libtinyxml-dev,
mpi-default-dev,
python-pip,
python-setuptools,
python3-pip,
python3-setuptools,
zlib1g-dev
Package: libnektar++
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment