diff --git a/neuron.spec b/neuron.spec index 816a3c7..4e3ac25 100644 --- a/neuron.spec +++ b/neuron.spec @@ -22,7 +22,7 @@ Please install the %{name}-devel package to compile nmodl files and so on. Name: neuron Version: 7.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A flexible and powerful simulator of neurons and networks License: GPLv3+ @@ -57,7 +57,7 @@ BuildRequires: catch-devel # Needs to be packaged separately # BuildRequires: coreneuron-devel BuildRequires: flex -BuildRequires: libfl-devel +BuildRequires: (flex-devel or libfl-devel) BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: git-core @@ -133,6 +133,9 @@ for f in bin/*_makefile.in; do sed -r -i 's|(LIBTOOL.*=.*)\$\(pkgdatadir\)(.*)|\1$(bindir)\2|' $f done +# Stop system from using hard coded flags +sed -i '/CompilerFlagsHelpers/ d' cmake/ReleaseDebugAutoFlags.cmake + %build # Not yet to be used # export SUNDIALS_SYSTEM_INSTALL="yes" @@ -141,7 +144,7 @@ done -DNRN_ENABLE_SHARED=ON \ -DNRN_ENABLE_INTERVIEWS=ON \ -DNRN_ENABLE_PYTHON=ON \ --DNRN_ENABLE_PYTHON_DYNAMIC=ON \ +-DNRN_ENABLE_PYTHON_DYNAMIC=OFF \ -DNRN_ENABLE_THREADS=ON \ -DNRN_ENABLE_MEMACS=ON \ -DNRN_ENABLE_RX3D=ON \ @@ -208,12 +211,14 @@ rm -rfv $RPM_BUILD_ROOT/%{_prefix}/lib/python/neuron/ pushd $RPM_BUILD_ROOT/%{_libdir}/ ln -sv ./libnrniv.so.0.0.0 libnrniv.so.0 ln -sv ./librxdmath.so.0.0.0 librxdmath.so.0 - ln -sv ./libnrnpython3.so.0.0.0 libnrnpython3.so.0 popd # Remove stray cpp file rm -fv $RPM_BUILD_ROOT/%{_datadir}/%{tarname}/*.cpp +# Remove iv header provided by iv package +rm -rf $RPM_BUILD_ROOT/%{_includedir}/ivstream.h + # The makefiles do not have shebangs %files %license Copyright @@ -230,8 +235,6 @@ rm -fv $RPM_BUILD_ROOT/%{_datadir}/%{tarname}/*.cpp %{_libdir}/libnrniv.so.0 %{_libdir}/librxdmath.so.0.0.0 %{_libdir}/librxdmath.so.0 -%{_libdir}/libnrnpython3.so.0.0.0 -%{_libdir}/libnrnpython3.so.0 # other hoc files and data %dir %{_datadir}/%{tarname} %{_datadir}/%{tarname}/lib @@ -258,13 +261,17 @@ rm -fv $RPM_BUILD_ROOT/%{_datadir}/%{tarname}/*.cpp # Shared objects %{_libdir}/libnrniv.so %{_libdir}/librxdmath.so -%{_libdir}/libnrnpython3.so %files doc %license Copyright %{_datadir}/%{tarname}/demo %changelog +* Thu Oct 08 2020 Ankur Sinha - 7.8.1-3 +- Remove iv header +- disable dynamic build, not needed for Fedora: we support the default python version +- disble hard coded compiler flags + * Fri Sep 04 2020 Ankur Sinha - 7.8.1-2 - Correct flex dependency - #1871091