From cb7e44afcdb3f9e39ec8093b0f38cda5bc111f2d Mon Sep 17 00:00:00 2001
From: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur@gmail.com>
Date: Oct 05 2018 18:23:43 +0000
Subject: Update to 2.16


---

diff --git a/nest.spec b/nest.spec
index 529ccd7..5943ffb 100644
--- a/nest.spec
+++ b/nest.spec
@@ -24,6 +24,12 @@ License:        GPLv2+
 URL:            http://www.nest-simulator.org/
 Source0:        https://github.com/%{name}/%{name}-simulator/archive/%{gittag}/%{name}-%{version}.tar.gz
 
+# 2.16 does not support 32 bit architectures
+# https://github.com/nest/nest-simulator/issues/1031
+# https://bugzilla.redhat.com/show_bug.cgi?id=1636573
+ExcludeArch: i686
+ExcludeArch: armv7hl
+
 # Let it build and install the cythonised shared object
 # But we still build our python modules ourselves
 Patch0:         %{name}-0000-disable-python-build-install.patch
@@ -71,6 +77,13 @@ Summary:    Common files for %{name}
 %description common
 %{_description}
 
+%package headers
+BuildArch:  noarch
+Summary:    Header files for %{name}
+
+%description headers
+%{_description}
+
 %package doc
 BuildArch:  noarch
 Summary:    Documentation for %{name}
@@ -117,6 +130,12 @@ Summary:    Common files for %{name} built with openmpi support
 %description openmpi-common
 %{_description}
 
+%package openmpi-headers
+Summary:    Header files for %{name} built with openmpi support
+
+%description openmpi-headers
+%{_description}
+
 %package -n python2-%{name}-openmpi
 Summary:    Python2 bindings for nest with openmpi support
 BuildRequires:  rpm-mpi-hooks
@@ -159,6 +178,13 @@ Summary:    Common files for %{name} built with mpich support
 %description mpich-common
 %{_description}
 
+%package mpich-headers
+Summary:    Header files for %{name} built with mpich support
+
+%description mpich-headers
+%{_description}
+
+
 %package -n python2-%{name}-mpich
 Summary:    Python2 bindings for nest with mpich support
 BuildRequires:  rpm-mpi-hooks
@@ -264,9 +290,14 @@ cp -a %{name}-simulator-%{version} %{name}-simulator-%{version}-py3
 sed -i '/add_subdirectory.*doc/ d' %{name}-simulator-%{version}-py3/CMakeLists.txt
 sed -i '/add_subdirectory.*examples/ d' %{name}-simulator-%{version}-py3/CMakeLists.txt
 
+
+# Remove ambiguous shebangs
+find %{name}-simulator-%{version}/ -name "*.py" -exec sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' '{}' \;
+find %{name}-simulator-%{version}-py3/ -name "*.py" -exec sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|' '{}' \;
+
 %if %{with_mpich}
     cp -a %{name}-simulator-%{version} %{name}-simulator-%{version}-mpich
-    cp -a %{name}-simulator-%{version} %{name}-simulator-%{version}-mpich-py3
+    cp -a %{name}-simulator-%{version}-py3 %{name}-simulator-%{version}-mpich-py3
 
     # Don't generate docs for each build
     sed -i '/add_subdirectory.*doc/ d' %{name}-simulator-%{version}-mpich/CMakeLists.txt
@@ -281,7 +312,7 @@ sed -i '/add_subdirectory.*examples/ d' %{name}-simulator-%{version}-py3/CMakeLi
 
 %if %{with_openmpi}
     cp -a %{name}-simulator-%{version} %{name}-simulator-%{version}-openmpi
-    cp -a %{name}-simulator-%{version} %{name}-simulator-%{version}-openmpi-py3
+    cp -a %{name}-simulator-%{version}-py3 %{name}-simulator-%{version}-openmpi-py3
 
     # Don't generate docs for these
     sed -i '/add_subdirectory.*doc/ d' %{name}-simulator-%{version}-openmpi/CMakeLists.txt
@@ -640,6 +671,9 @@ export MPI_SITEARCH=$MPI_PYTHON3_SITEARCH
 %files common
 %{_datadir}/%{name}
 
+%files headers
+%{_includedir}/%{name}
+
 %files doc
 %doc %{_pkgdocdir}
 
@@ -672,6 +706,9 @@ export MPI_SITEARCH=$MPI_PYTHON3_SITEARCH
 %files mpich-common
 %{_libdir}/mpich/share/%{name}
 
+%files mpich-headers
+%{_libdir}/mpich/include/%{name}
+
 %files -n python2-%{name}-mpich
 %license LICENSE
 %{python2_sitearch}/mpich/%{name}
@@ -700,6 +737,9 @@ export MPI_SITEARCH=$MPI_PYTHON3_SITEARCH
 %files openmpi-common
 %{_libdir}/openmpi/share/%{name}
 
+%files openmpi-headers
+%{_libdir}/openmpi/include/%{name}
+
 %files -n python2-%{name}-openmpi
 %license LICENSE
 %{python2_sitearch}/openmpi/%{name}
@@ -714,8 +754,11 @@ export MPI_SITEARCH=$MPI_PYTHON3_SITEARCH
 %endif
 
 %changelog
-* Sat Sep 15 2018 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.16.0-1
+* Fri Oct 05 2018 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.16.0-1
+- Exclude 32 bit architectures: https://github.com/nest/nest-simulator/issues/1031
+- Use python version specific shebangs
 - Update to latest upstream release
+- Place headers in separate packages
 
 * Fri Jul 27 2018 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.14.0-4
 - Improve readme