From d1e07529a1fce70626be67233527b5e4c0684293 Mon Sep 17 00:00:00 2001
From: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur@gmail.com>
Date: Oct 18 2019 12:43:09 +0000
Subject: Rebuild with MUSIC support


---

diff --git a/nest.spec b/nest.spec
index 6ce25f2..1a0ef05 100644
--- a/nest.spec
+++ b/nest.spec
@@ -16,7 +16,7 @@ Version:        2.18.0
 
 %global gittag v%{version}
 
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        The neural simulation tool
 
 License:        GPLv2+
@@ -100,6 +100,8 @@ Summary:        %{name} built with openmpi
 BuildRequires:  openmpi-devel
 BuildRequires:  rpm-mpi-hooks
 BuildRequires:  libneurosim-openmpi-devel
+BuildRequires:  MUSIC-openmpi-devel
+BuildRequires:  MUSIC-openmpi
 Requires:       openmpi
 Requires:       %{name}-openmpi-common = %{version}-%{release}
 
@@ -135,6 +137,8 @@ Summary:        %{name} built with mpich
 BuildRequires:  mpich-devel
 BuildRequires:  rpm-mpi-hooks
 BuildRequires:  libneurosim-mpich-devel
+BuildRequires:  MUSIC-mpich-devel
+BuildRequires:  MUSIC-mpich
 Requires:       mpich
 Requires:       %{name}-mpich-common = %{version}-%{release}
 
@@ -239,6 +243,14 @@ pushd %{name}-simulator-%{version}$MPI_COMPILE_TYPE  && \
         -DPYEXECDIR:PATH=$MPI_SITEARCH \\\
         -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \\\
         -DBUILD_SHARED_LIBS:BOOL=ON \\\
+%if %{music} \
+        -Dwith-music:BOOL=ON \\\
+        -DMUSIC_INCLUDE_DIR:PATH=$MPI_INCLUDE/music.hh \\\
+        -DMUSIC_LIBRARY:PATH=$MPI_LIB/libmusic.so \\\
+        -DMUSIC_EXECUTABLE:PATH=$MPI_BIN/music$MPI_SUFFIX \\\
+%else \
+        -Dwith-music:BOOL=OFF \\\
+%endif \
 %if "%{_lib}" == "lib64" \
         -DLIB_SUFFIX=64 . && \
 %else                      \
@@ -247,7 +259,7 @@ pushd %{name}-simulator-%{version}$MPI_COMPILE_TYPE  && \
 popd || exit -1;
 
 %global do_make_build \
-    make %{?_smp_mflags} -C %{name}-simulator-%{version}$MPI_COMPILE_TYPE || exit -1
+    %make_build -C %{name}-simulator-%{version}$MPI_COMPILE_TYPE || exit -1
 
 %global do_pybuild \
 pushd %{name}-simulator-%{version}$MPI_COMPILE_TYPE  && \
@@ -263,6 +275,8 @@ pushd %{name}-simulator-%{version}$MPI_COMPILE_TYPE  && \
 popd || exit -1;
 
 # Build serial version, dummy arguments
+# Disable music, which requires MPI to be ON
+%global music 0
 export MPI_PYTHON3_SITEARCH="%{python3_sitearch}"
 export MPI_COMPILER=serial
 export MPI_SUFFIX=""
@@ -280,6 +294,8 @@ export MPI_SITEARCH=$MPI_PYTHON3_SITEARCH
 %{do_make_build}
 %{do_pybuild}
 
+# Enable music support
+%global music 1
 # Build mpich version
 %if %{with mpich}
 %{_mpich_load}
@@ -326,7 +342,7 @@ export MPI_SITEARCH=$MPI_PYTHON3_SITEARCH
 echo  \
 echo "*** INSTALLING %{name}-simulator-%{version}$MPI_COMPILE_TYPE ***"  \
 echo  \
-    make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" CPPROG="cp -p" -C %{name}-simulator-%{version}$MPI_COMPILE_TYPE || exit -1
+    %make_install -C %{name}-simulator-%{version}$MPI_COMPILE_TYPE || exit -1
 
 
 # Only install the pynestkernel
@@ -590,6 +606,10 @@ export MPI_SITEARCH=$MPI_PYTHON3_SITEARCH
 %endif
 
 %changelog
+* Wed Oct 16 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.18.0-7
+- Rebuild with MUSIC support
+- MUSIC requires MPI support to be enabled
+
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.18.0-6
 - Rebuilt for Python 3.8.0rc1 (#1748018)