diff --git a/0001-Unbundle-Random123.patch b/0001-Unbundle-Random123.patch index 86b77aa..db8333f 100644 --- a/0001-Unbundle-Random123.patch +++ b/0001-Unbundle-Random123.patch @@ -1,7 +1,7 @@ From b5a4df18e249b9b0181698e3353b57e1063ebede Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Wed, 19 Jun 2019 18:35:39 +0100 -Subject: [PATCH 1/2] Unbundle Random123 +Subject: [PATCH 1/3] Unbundle Random123 --- configure.ac | 2 +- diff --git a/0002-Unbundle-readline.patch b/0002-Unbundle-readline.patch index e177fa1..820b57c 100644 --- a/0002-Unbundle-readline.patch +++ b/0002-Unbundle-readline.patch @@ -1,7 +1,7 @@ From 6acd994ba41f05cef28c789c9125f264f0d4e9cc Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Wed, 19 Jun 2019 18:37:49 +0100 -Subject: [PATCH 2/2] Unbundle readline +Subject: [PATCH 2/3] Unbundle readline --- configure.ac | 3 +-- diff --git a/0003-Remove-iv-include.patch b/0003-Remove-iv-include.patch new file mode 100644 index 0000000..8a3a193 --- /dev/null +++ b/0003-Remove-iv-include.patch @@ -0,0 +1,27 @@ +From ccf69494d55252dbdcf94c2fc5fbe3ca286ed48f Mon Sep 17 00:00:00 2001 +From: "Ankur Sinha (Ankur Sinha Gmail)" +Date: Wed, 19 Jun 2019 21:37:21 +0100 +Subject: [PATCH 3/3] Remove iv include + +--- + configure.ac | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 61a06940..5dc5b111 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -33,10 +33,6 @@ AH_TOP([ + #define H_nrnconf_included 1 + ]) + AH_BOTTOM([ +-#if defined(__cplusplus) +-#include +-#endif +- + #if defined(CYGWIN) || defined(MINGW) + #define WIN32 1 + #endif +-- +2.21.0 + diff --git a/neuron.spec b/neuron.spec index 623a3fb..04afee3 100644 --- a/neuron.spec +++ b/neuron.spec @@ -27,7 +27,7 @@ Please install the %{name}-devel package to compile nmodl files and so on. Name: neuron Version: 7.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A flexible and powerful simulator of neurons and networks License: GPLv3+ @@ -43,6 +43,11 @@ Patch0: 0001-Unbundle-Random123.patch # Unbundle readline Patch1: 0002-Unbundle-readline.patch +# If without iv, this needs to be +%if !%{with iv} +Patch2: 0003-Remove-iv-include.patch +%endif + # Random123 does not build on these, so neither can NEURON # https://github.com/neuronsimulator/nrn/issues/114 ExcludeArch: %{arm} mips64r2 mips32r2 s390 s390x @@ -261,6 +266,9 @@ mv $RPM_BUILD_ROOT/%{_bindir}/oc $RPM_BUILD_ROOT/%{_bindir}/hoc %{_datadir}/%{tarname}/demo %changelog +* Wed Jun 19 2019 Ankur Sinha - 7.7.1-2 +- Remove iv header from nrnconfig file + * Wed Jun 19 2019 Ankur Sinha - 7.7.1-1 - Revert to using release tar - Use bundled sundials