The package rpms/nest.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/nest.git/commit/?id=ef85260b4020b8a9....
Change: -ExcludeArch: armv7hl
Thanks.
Full change: ============
commit ef85260b4020b8a943e68d5332857ec644067e67 Author: Ankur Sinha (Ankur Sinha Gmail) sanjay.ankur@gmail.com Date: Fri Jul 19 13:05:55 2019 +0100
Update to 2.18.0
diff --git a/.gitignore b/.gitignore index 7c489ab..f3ec4b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /nest-2.14.0.tar.gz /nest-2.16.0.tar.gz +/nest-2.18.0.tar.gz diff --git a/nest-0000-disable-pybits.patch b/nest-0000-disable-pybits.patch new file mode 100644 index 0000000..b13fbe8 --- /dev/null +++ b/nest-0000-disable-pybits.patch @@ -0,0 +1,100 @@ +diff -ur nest-simulator-2.18.0.orig/doc/CMakeLists.txt nest-simulator-2.18.0/doc/CMakeLists.txt +--- nest-simulator-2.18.0.orig/doc/CMakeLists.txt 2019-06-27 21:03:52.000000000 +0100 ++++ nest-simulator-2.18.0/doc/CMakeLists.txt 2019-07-19 09:59:04.821572528 +0100 +@@ -36,12 +36,12 @@ + # Extract help from all source files in the source code, put + # them in doc/help and generate a local help index in the + # build directory containing links to the help files. +- install( CODE +- "execute_process( +- COMMAND ${PYTHON_EXECUTABLE} -B generate_help.py "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}" +- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/extras/help_generator" +- )" +- ) ++ # install( CODE ++ # "execute_process( ++ # COMMAND ${PYTHON_EXECUTABLE} -B generate_help.py "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}" ++ # WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/extras/help_generator" ++ # )" ++ # ) + + # Copy the local doc/help directory to the global installation + # directory for documentation. +diff -ur nest-simulator-2.18.0.orig/extras/ConnPlotter/CMakeLists.txt nest-simulator-2.18.0/extras/ConnPlotter/CMakeLists.txt +--- nest-simulator-2.18.0.orig/extras/ConnPlotter/CMakeLists.txt 2019-06-27 21:03:52.000000000 +0100 ++++ nest-simulator-2.18.0/extras/ConnPlotter/CMakeLists.txt 2019-07-19 09:57:21.629046268 +0100 +@@ -18,14 +18,14 @@ + # along with NEST. If not, see http://www.gnu.org/licenses/. + + if ( HAVE_PYTHON ) +- install( CODE "execute_process( +- COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build +- install --prefix=${CMAKE_INSTALL_PREFIX} +- --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR} +- --install-scripts=${CMAKE_INSTALL_FULL_BINDIR} +- --install-data=${CMAKE_INSTALL_FULL_DATADIR} +- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")" +- ) ++ # install( CODE "execute_process( ++ # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build ++ # install --prefix=${CMAKE_INSTALL_PREFIX} ++ # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR} ++ # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR} ++ # --install-data=${CMAKE_INSTALL_FULL_DATADIR} ++ # WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")" ++ # ) + + install( FILES examples/connplotter_tutorial.py + DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples/ConnPlotter +diff -ur nest-simulator-2.18.0.orig/pynest/CMakeLists.txt nest-simulator-2.18.0/pynest/CMakeLists.txt +--- nest-simulator-2.18.0.orig/pynest/CMakeLists.txt 2019-06-27 21:03:52.000000000 +0100 ++++ nest-simulator-2.18.0/pynest/CMakeLists.txt 2019-07-19 09:57:54.674894555 +0100 +@@ -73,14 +73,14 @@ + -D_IS_PYNEST + ) + +- install( CODE "execute_process( +- COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build +- install --prefix=${CMAKE_INSTALL_PREFIX} +- --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR} +- --install-scripts=${CMAKE_INSTALL_FULL_BINDIR} +- --install-data=${CMAKE_INSTALL_FULL_DATADIR} +- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")" +- ) ++ # install( CODE "execute_process( ++ # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build ++ # install --prefix=${CMAKE_INSTALL_PREFIX} ++ # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR} ++ # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR} ++ # --install-data=${CMAKE_INSTALL_FULL_DATADIR} ++ # WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")" ++ # ) + install( TARGETS pynestkernel DESTINATION ${PYEXECDIR}/nest/ ) + install( FILES ${PROJECT_BINARY_DIR}/pynest/do_tests.py + DESTINATION ${CMAKE_INSTALL_DATADIR}/extras +diff -ur nest-simulator-2.18.0.orig/topology/CMakeLists.txt nest-simulator-2.18.0/topology/CMakeLists.txt +--- nest-simulator-2.18.0.orig/topology/CMakeLists.txt 2019-06-27 21:03:52.000000000 +0100 ++++ nest-simulator-2.18.0/topology/CMakeLists.txt 2019-07-19 09:58:08.541830894 +0100 +@@ -82,14 +82,14 @@ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nest) + + if ( HAVE_PYTHON ) +- install( CODE "execute_process( +- COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build +- install --prefix=${CMAKE_INSTALL_PREFIX} +- --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR} +- --install-scripts=${CMAKE_INSTALL_FULL_BINDIR} +- --install-data=${CMAKE_INSTALL_FULL_DATADIR} +- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")" +- ) ++ # install( CODE "execute_process( ++ # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build ++ # install --prefix=${CMAKE_INSTALL_PREFIX} ++ # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR} ++ # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR} ++ # --install-data=${CMAKE_INSTALL_FULL_DATADIR} ++ # WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")" ++ # ) + + file( GLOB topo_examples "examples/*" ) + install( FILES ${topo_examples} diff --git a/nest-0000-disable-python-build-install.patch b/nest-0000-disable-python-build-install.patch deleted file mode 100644 index 759f8e0..0000000 --- a/nest-0000-disable-python-build-install.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -ur nest-simulator-2.16.0.orig/extras/ConnPlotter/CMakeLists.txt nest-simulator-2.16.0/extras/ConnPlotter/CMakeLists.txt ---- nest-simulator-2.16.0.orig/extras/ConnPlotter/CMakeLists.txt 2018-09-15 20:51:08.153203492 +0100 -+++ nest-simulator-2.16.0/extras/ConnPlotter/CMakeLists.txt 2018-09-15 20:52:16.277867696 +0100 -@@ -19,13 +19,13 @@ - - if ( HAVE_PYTHON ) -- install( CODE "execute_process( -- COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build -- install --prefix=${CMAKE_INSTALL_PREFIX} -- --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR} -- --install-scripts=${CMAKE_INSTALL_FULL_BINDIR} -- --install-data=${CMAKE_INSTALL_FULL_DATADIR} -- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")" -- ) -+ # install( CODE "execute_process( -+ # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build -+ # install --prefix=${CMAKE_INSTALL_PREFIX} -+ # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR} -+ # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR} -+ # --install-data=${CMAKE_INSTALL_FULL_DATADIR} -+ # WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")" -+ # ) - - install( FILES examples/connplotter_tutorial.py - DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples/ConnPlotter -diff -ur nest-simulator-2.16.0.orig/pynest/CMakeLists.txt nest-simulator-2.16.0/pynest/CMakeLists.txt ---- nest-simulator-2.16.0.orig/pynest/CMakeLists.txt 2018-09-15 20:51:08.203203246 +0100 -+++ nest-simulator-2.16.0/pynest/CMakeLists.txt 2018-09-15 20:52:57.497664513 +0100 -@@ -73,14 +73,14 @@ - -D_IS_PYNEST - ) - -- install( CODE "execute_process( -- COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build -- install --prefix=${CMAKE_INSTALL_PREFIX} -- --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR} -- --install-scripts=${CMAKE_INSTALL_FULL_BINDIR} -- --install-data=${CMAKE_INSTALL_FULL_DATADIR} -- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")" -- ) -+ # install( CODE "execute_process( -+ # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build -+ # install --prefix=${CMAKE_INSTALL_PREFIX} -+ # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR} -+ # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR} -+ # --install-data=${CMAKE_INSTALL_FULL_DATADIR} -+ # WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")" -+ # ) - install( TARGETS pynestkernel DESTINATION ${PYEXECDIR}/nest/ ) - install( FILES ${PROJECT_BINARY_DIR}/pynest/do_tests.py - DESTINATION ${CMAKE_INSTALL_DATADIR}/extras -diff -ur nest-simulator-2.16.0.orig/topology/CMakeLists.txt nest-simulator-2.16.0/topology/CMakeLists.txt ---- nest-simulator-2.16.0.orig/topology/CMakeLists.txt 2018-09-15 20:51:08.248203024 +0100 -+++ nest-simulator-2.16.0/topology/CMakeLists.txt 2018-09-15 20:53:22.620540676 +0100 -@@ -85,14 +85,14 @@ - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nest) - - if ( HAVE_PYTHON ) -- install( CODE "execute_process( -- COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build -- install --prefix=${CMAKE_INSTALL_PREFIX} -- --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR} -- --install-scripts=${CMAKE_INSTALL_FULL_BINDIR} -- --install-data=${CMAKE_INSTALL_FULL_DATADIR} -- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")" -- ) -+ # install( CODE "execute_process( -+ # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build -+ # install --prefix=${CMAKE_INSTALL_PREFIX} -+ # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR} -+ # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR} -+ # --install-data=${CMAKE_INSTALL_FULL_DATADIR} -+ # WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")" -+ # ) - - file( GLOB topo_examples "examples/*" ) - install( FILES ${topo_examples} diff --git a/nest-0001-disable-helpindex-update.patch b/nest-0001-disable-helpindex-update.patch deleted file mode 100644 index 301a667..0000000 --- a/nest-0001-disable-helpindex-update.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ur nest-simulator-2.16.0.orig/doc/CMakeLists.txt nest-simulator-2.16.0/doc/CMakeLists.txt ---- nest-simulator-2.16.0.orig/doc/CMakeLists.txt 2018-09-15 21:05:51.070924373 +0100 -+++ nest-simulator-2.16.0/doc/CMakeLists.txt 2018-09-15 21:07:04.101573244 +0100 -@@ -52,12 +52,12 @@ - - # Update the global help index to include all help files in - # the global installation directory for documentation. -- install( CODE -- "execute_process( -- COMMAND ${PYTHON_EXECUTABLE} -B generate_helpindex.py "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DOCDIR}" -- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/extras/help_generator" -- )" -- ) -+ # install( CODE -+ # "execute_process( -+ # COMMAND ${PYTHON_EXECUTABLE} -B generate_helpindex.py "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DOCDIR}" -+ # WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/extras/help_generator" -+ # )" -+ # ) - - endif () - diff --git a/nest.spec b/nest.spec index 927be1e..5f50572 100644 --- a/nest.spec +++ b/nest.spec @@ -1,8 +1,5 @@ # We build the python bit separately - their build system doesn't let me build # and install separately - everything is done at install time -# Doing it ourselves also tells us exactly what's going on, and ensures that -# all flags are respected - we can also build the python2 and python3 bits -# separately.
# We do not build the developer documentation with doxygen. Advanced developers # that develop based on the source git tree can build it themselves @@ -10,23 +7,16 @@ %bcond_without mpich %bcond_without openmpi
-# https://fedoraproject.org/wiki/Packaging:DistTag?rd=Packaging/DistTag#Condit... -%if 0%{?fedora} >= 30 -%bcond_with py2 -%else -%bcond_without py2 -%endif - # Tests include source linters and so on, and require a specific older version # of vera and clang and so forth, so we simply rely on upstream CI here %bcond_with tests
Name: nest -Version: 2.16.0 +Version: 2.18.0
%global gittag v%{version}
-Release: 11%{?dist} +Release: 1%{?dist} Summary: The neural simulation tool
License: GPLv2+ @@ -34,29 +24,18 @@ URL: http://www.nest-simulator.org/ Source0: https://github.com/%%7Bname%7D/%%7Bname%7D-simulator/archive/%%7Bgittag%7D/%... Source1: README-Fedora.md
-# 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 +# 1. Let it build and install the cythonised shared object But we still build +# our python modules ourselves
-# the helpindex must be generated after the help files have been installed to -# the install location, so we do this manually because the script doesn't +# 2. The helpindex must be generated after the help files have been installed +# to the install location, so we do this manually because the script doesn't # respect rpmbuildroot and so on -Patch1: %{name}-0001-disable-helpindex-update.patch +Patch0: %{name}-0000-disable-pybits.patch +
BuildRequires: ncurses-devel BuildRequires: gsl-devel BuildRequires: readline-devel -%if %{with py2} -BuildRequires: python2-devel -BuildRequires: python2-Cython -BuildRequires: python2-nose -%endif BuildRequires: python3-devel BuildRequires: python3-Cython BuildRequires: python3-nose @@ -69,57 +48,40 @@ BuildRequires: gcc-c++ BuildRequires: libneurosim-devel Requires: %{name}-common
-%global _description \ -NEST is a simulator for spiking neural network models that focuses on the \ -dynamics, size and structure of neural systems rather than on the exact \ -morphology of individual neurons. The development of NEST is coordinated by the \ -NEST Initiative. NEST is ideal for networks of spiking neurons of any size, \ -for example: Models of information processing e.g. in the visual or auditory \ -cortex of mammals; Models of network activity dynamics, e.g. laminar cortical \ -networks or balanced random networks; Models of learning and plasticity. \ -Please read the README-Fedora.md file provided in each package for information on \ -how these NEST packages are to be used. \ -\ +%global _description %{expand: +NEST is a simulator for spiking neural network models that focuses on the +dynamics, size and structure of neural systems rather than on the exact +morphology of individual neurons. The development of NEST is coordinated by the +NEST Initiative. NEST is ideal for networks of spiking neurons of any size, +for example: Models of information processing e.g. in the visual or auditory +cortex of mammals; Models of network activity dynamics, e.g. laminar cortical +networks or balanced random networks; Models of learning and plasticity. +Please read the README-Fedora.md file provided in each package for information +on how these NEST packages are to be used. + Documentation is available separately in the nest-doc package. +}
-%description -%{_description} +%description %_description
%package common BuildArch: noarch Summary: Common files for %{name}
-%description common -%{_description} +%description common %_description
%package headers BuildArch: noarch Summary: Header files for %{name}
-%description headers -%{_description} +%description headers %_description
%package doc BuildArch: noarch Summary: Documentation for %{name}
-%description doc -%{_description} - - -%if %{with py2} -%package -n python2-%{name} -Summary: Python2 bindings for nest -Requires: %{name} = %{version}-%{release} -Requires: %{name}-common = %{version}-%{release} -Requires: %{py2_dist numpy} %{py2_dist scipy} -Recommends: %{py2_dist matplotlib} -Recommends: %{py2_dist ipython} -%{?python_provide:%python_provide python2-%{name}} +%description doc %_description
-%description -n python2-%{name} -%{_description} -%endif
%package -n python3-%{name} Summary: Python3 bindings for nest @@ -130,8 +92,7 @@ Recommends: %{py3_dist matplotlib} Recommends: %{py3_dist ipython} %{?python_provide:%python_provide python3-%{name}}
-%description -n python3-%{name} -%{_description} +%description -n python3-%{name} %_description
%if %{with openmpi} %package openmpi @@ -142,36 +103,17 @@ BuildRequires: libneurosim-openmpi-devel Requires: openmpi Requires: %{name}-openmpi-common = %{version}-%{release}
-%description openmpi -%{_description} +%description openmpi %_description
%package openmpi-common Summary: Common files for %{name} built with openmpi support
-%description openmpi-common -%{_description} +%description openmpi-common %_description
%package openmpi-headers Summary: Header files for %{name} built with openmpi support
-%description openmpi-headers -%{_description} - -%if %{with py2} -%package -n python2-%{name}-openmpi -Summary: Python2 bindings for nest with openmpi support -BuildRequires: rpm-mpi-hooks -Requires: openmpi -Requires: %{name}-openmpi = %{version}-%{release} -Requires: %{name}-openmpi-common = %{version}-%{release} -Requires: %{py2_dist numpy} %{py2_dist scipy} -Recommends: %{py2_dist matplotlib} -Recommends: %{py2_dist ipython} -%{?python_provide:%python_provide python2-%{name}-openmpi} - -%description -n python2-%{name}-openmpi -%{_description} -%endif +%description openmpi-headers %_description
%package -n python3-%{name}-openmpi Summary: Python3 bindings for nest with openmpi support @@ -184,8 +126,7 @@ Recommends: %{py3_dist matplotlib} Recommends: %{py3_dist ipython} %{?python_provide:%python_provide python3-%{name}-openmpi}
-%description -n python3-%{name}-openmpi -%{_description} +%description -n python3-%{name}-openmpi %_description %endif
%if %{with mpich} @@ -197,38 +138,19 @@ BuildRequires: libneurosim-mpich-devel Requires: mpich Requires: %{name}-mpich-common = %{version}-%{release}
-%description mpich -%{_description} +%description mpich %_description
%package mpich-common Summary: Common files for %{name} built with mpich support
-%description mpich-common -%{_description} +%description mpich-common %_description
%package mpich-headers Summary: Header files for %{name} built with mpich support
-%description mpich-headers -%{_description} +%description mpich-headers %_description
-%if %{with py2} -%package -n python2-%{name}-mpich -Summary: Python2 bindings for nest with mpich support -BuildRequires: rpm-mpi-hooks -Requires: %{name}-mpich = %{version}-%{release} -Requires: %{name}-mpich-common = %{version}-%{release} -Requires: mpich -Requires: %{py2_dist numpy} %{py2_dist scipy} -Recommends: %{py2_dist matplotlib} -Recommends: %{py2_dist ipython} -%{?python_provide:%python_provide python2-%{name}-mpich} - -%description -n python2-%{name}-mpich -%{_description} -%endif - %package -n python3-%{name}-mpich Summary: Python3 bindings for nest with mpich support BuildRequires: rpm-mpi-hooks @@ -240,8 +162,7 @@ Recommends: %{py3_dist matplotlib} Recommends: %{py3_dist ipython} %{?python_provide:%python_provide python3-%{name}-mpich}
-%description -n python3-%{name}-mpich -%{_description} +%description -n python3-%{name}-mpich %_description %endif
%prep @@ -261,30 +182,15 @@ sed -i '/PATH=/ d' extras/nest_vars.sh.in sed -i 's|NEST_PYTHON_PREFIX=$NEST_INSTALL_DIR/@PYEXECDIR@|NEST_PYTHON_PREFIX=@PYEXECDIR@|' extras/nest_vars.sh.in popd
-# py3 build directories do not have a suffix, py2 ones have -py2 -cp -a %{name}-simulator-%{version} %{name}-simulator-%{version}-py2 - # Find py3 version of libneurosim in the py3 builds/packages -# Do not make this change in py2 versions, so we do it after the copy above sed -i 's/pyneurosim/py3neurosim/' %{name}-simulator-%{version}/cmake/FindLibNeurosim.cmake
-# Generate docs in the py3 builds, not in the py2 builds. -sed -i '/add_subdirectory.*doc/ d' %{name}-simulator-%{version}-py2/CMakeLists.txt -sed -i '/add_subdirectory.*examples/ d' %{name}-simulator-%{version}-py2/CMakeLists.txt -sed -i '/add_subdirectory.*testsuite/ d' %{name}-simulator-%{version}-py2/CMakeLists.txt - -# Correct shebangs for python2 -find %{name}-simulator-%{version}-py2/ -name "*.py" -exec sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' '{}' ; # Correct shebangs for py3 find %{name}-simulator-%{version}/ -name "*.py" -exec sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|' '{}' ;
%if %{with mpich} - %if %{with py2} - cp -a %{name}-simulator-%{version}-py2 %{name}-simulator-%{version}-mpich-py2 - %endif cp -a %{name}-simulator-%{version} %{name}-simulator-%{version}-mpich
- # Already removed for py2 versions, but remove them for mpi variants too # Don't generate docs for each build sed -i '/add_subdirectory.*doc/ d' %{name}-simulator-%{version}-mpich/CMakeLists.txt # Don't install examples and extras for each @@ -294,12 +200,8 @@ find %{name}-simulator-%{version}/ -name "*.py" -exec sed -i 's|#!/usr/bin/env p %endif
%if %{with openmpi} - %if %{with py2} - cp -a %{name}-simulator-%{version}-py2 %{name}-simulator-%{version}-openmpi-py2 - %endif cp -a %{name}-simulator-%{version} %{name}-simulator-%{version}-openmpi
- # Already removed for py2 versions, but remove them for mpi variants too # Don't generate docs for these sed -i '/add_subdirectory.*doc/ d' %{name}-simulator-%{version}-openmpi/CMakeLists.txt # Don't install examples and extras for each @@ -361,7 +263,6 @@ pushd %{name}-simulator-%{version}$MPI_COMPILE_TYPE && \ popd || exit -1;
# Build serial version, dummy arguments -export MPI_PYTHON2_SITEARCH="%{python2_sitearch}" export MPI_PYTHON3_SITEARCH="%{python3_sitearch}" export MPI_COMPILER=serial export MPI_SUFFIX="" @@ -379,18 +280,6 @@ export MPI_SITEARCH=$MPI_PYTHON3_SITEARCH %{do_make_build} %{do_pybuild}
-# Python 2 -%if %{with py2} -export MPI_COMPILE_TYPE="-py2" -export PYTHON_VERSION="2" -export PYTHON_BIN="%{__python2}" -export MPI_SITEARCH=$MPI_PYTHON2_SITEARCH -%{do_cmake_config} -%{do_make_build} -%{do_pybuild} -%endif - - # Build mpich version %if %{with mpich} %{_mpich_load} @@ -408,17 +297,6 @@ export MPI_SITEARCH=$MPI_PYTHON3_SITEARCH %{do_make_build} %{do_pybuild}
-# Python 2 -%if %{with py2} -export MPI_COMPILE_TYPE="-mpich-py2" -export PYTHON_VERSION="2" -export PYTHON_BIN="%{__python2}" -export MPI_SITEARCH=$MPI_PYTHON2_SITEARCH -%{do_cmake_config} -%{do_make_build} -%{do_pybuild} -%endif - %{_mpich_unload} %endif
@@ -439,17 +317,6 @@ export MPI_SITEARCH=$MPI_PYTHON3_SITEARCH %{do_make_build} %{do_pybuild}
-# Python 2 -%if %{with py2} -export MPI_COMPILE_TYPE="-openmpi-py2" -export MPI_SITEARCH=$MPI_PYTHON2_SITEARCH -export PYTHON_VERSION="2" -export PYTHON_BIN="%{__python2}" -%{do_cmake_config} -%{do_make_build} -%{do_pybuild} -%endif - %{_openmpi_unload} %endif
@@ -504,16 +371,6 @@ pushd %{name}-simulator-%{version}/extras/help_generator popd
-# Python 2 -%if %{with py2} -export MPI_COMPILE_TYPE="-py2" -export MPI_SITEARCH="%{python2_sitearch}" -export PYTHON_BIN="%{__python2}" -export MPI_COMPILER=serial -%{do_pynestkernel_install} -%{do_pyinstall} -%endif - # Install MPICH version %if %{with mpich} %{_mpich_load} @@ -523,14 +380,6 @@ export MPI_SITEARCH=$MPI_PYTHON3_SITEARCH export PYTHON_BIN="%{__python3}" %{do_install} %{do_pyinstall} -# Python 2 -%if %{with py2} -export MPI_COMPILE_TYPE="-mpich-py2" -export MPI_SITEARCH=$MPI_PYTHON2_SITEARCH -export PYTHON_BIN="%{__python2}" -%{do_pynestkernel_install} -%{do_pyinstall} -%endif
# Remove duplicated docs rm -rf $RPM_BUILD_ROOT/%{_libdir}/mpich/share/doc/%{name} @@ -561,14 +410,6 @@ export MPI_SITEARCH=$MPI_PYTHON3_SITEARCH export PYTHON_BIN="%{__python3}" %{do_install} %{do_pyinstall} -# Python 2 -%if %{with py2} -export MPI_COMPILE_TYPE="-openmpi-py2" -export MPI_SITEARCH=$MPI_PYTHON2_SITEARCH -export PYTHON_BIN="%{__python2}" -%{do_pynestkernel_install} -%{do_pyinstall} -%endif
# Remove duplicated docs rm -rf $RPM_BUILD_ROOT/%{_libdir}/openmpi/share/doc/%{name} @@ -610,16 +451,6 @@ echo \ nosetests-3 $NEST_PYTHONDIR/nest/tests $NEST_PYTHONDIR/nest/topology/tests
-# override MPI_BIN -export MPI_COMPILE_TYPE="-py2" -export NEST_BINDIR="%{_bindir}" -%if %{with py2} -export PYTHON_VERSION="2" -export PYTHON_BIN="%{__python2}" -export NEST_PYTHONDIR=%{python2_sitearch} -%{do_tests} -%endif - export MPI_COMPILE_TYPE="" export NEST_BINDIR="%{_bindir}" export PYTHON_VERSION="3" @@ -630,17 +461,6 @@ export NEST_PYTHONDIR=%{python3_sitearch} # Test mpich version %if %{with mpich} %{_mpich_load} -export MPI_COMPILE_TYPE="-mpich-py2" -export NEST_BINDIR=$MPI_BIN -# Python 2 -%if %{with py2} -export NEST_PYTHONDIR=$MPI_PYTHON2_SITEARCH -export PYTHON_VERSION="2" -export PYTHON_BIN="%{__python2}" -%{do_tests} -%endif - -# Python 3 export MPI_COMPILE_TYPE="-mpich" export NEST_BINDIR=$MPI_BIN export NEST_PYTHONDIR=$MPI_PYTHON3_SITEARCH @@ -654,16 +474,6 @@ export PYTHON_BIN="%{__python3}" # Test OpenMPI version %if %{with openmpi} %{_openmpi_load} -export MPI_COMPILE_TYPE="-openmpi-py2" -export MPI_SITEARCH=$MPI_PYTHON2_SITEARCH -# Python 2 -%if %{with py2} -export PYTHON_VERSION="2" -export PYTHON_BIN="%{__python2}" -%{do_tests} -%endif - -# Python 3 export MPI_COMPILE_TYPE="-openmpi" export PYTHON_VERSION="3" export PYTHON_BIN="%{__python3}" @@ -703,19 +513,10 @@ export MPI_SITEARCH=$MPI_PYTHON3_SITEARCH %files doc %doc %{_pkgdocdir}
-%if %{with py2} -%files -n python2-%{name} -%{python2_sitearch}/%{name} -%{python2_sitearch}/PyNEST-%{version}-py2.?.egg-info -%{python2_sitearch}/Topology-%{version}-py2.?.egg-info -%{python2_sitelib}/ConnPlotter -%{python2_sitelib}/ConnPlotter-0.7a-py2.?.egg-info -%endif - %files -n python3-%{name} %{python3_sitearch}/%{name} -%{python3_sitearch}/PyNEST-%{version}-py3.?.egg-info -%{python3_sitearch}/Topology-%{version}-py3.?.egg-info +%{python3_sitearch}/PyNEST-nest_%{version}-py3.?.egg-info +%{python3_sitearch}/Topology-nest_%{version}-py3.?.egg-info %{python3_sitelib}/ConnPlotter %{python3_sitelib}/ConnPlotter-0.7a-py3.?.egg-info
@@ -746,19 +547,11 @@ export MPI_SITEARCH=$MPI_PYTHON3_SITEARCH %files mpich-headers %{_includedir}/mpich-%{_arch}/%{name}
-%if %{with py2} -%files -n python2-%{name}-mpich -%license LICENSE -%{python2_sitearch}/mpich/%{name} -%{python2_sitearch}/mpich/PyNEST-%{version}-py2.?.egg-info -%{python2_sitearch}/mpich/Topology-%{version}-py2.?.egg-info -%endif - %files -n python3-%{name}-mpich %license LICENSE %{python3_sitearch}/mpich/%{name} -%{python3_sitearch}/mpich/PyNEST-%{version}-py3.?.egg-info -%{python3_sitearch}/mpich/Topology-%{version}-py3.?.egg-info +%{python3_sitearch}/mpich/PyNEST-nest_%{version}-py3.?.egg-info +%{python3_sitearch}/mpich/Topology-nest_%{version}-py3.?.egg-info %endif
%if %{with openmpi} @@ -789,22 +582,20 @@ export MPI_SITEARCH=$MPI_PYTHON3_SITEARCH %files openmpi-headers %{_includedir}/openmpi-%{_arch}/%{name}
-%if %{with py2} -%files -n python2-%{name}-openmpi -%license LICENSE -%{python2_sitearch}/openmpi/%{name} -%{python2_sitearch}/openmpi/PyNEST-%{version}-py2.?.egg-info -%{python2_sitearch}/openmpi/Topology-%{version}-py2.?.egg-info -%endif - %files -n python3-%{name}-openmpi %license LICENSE %{python3_sitearch}/openmpi/%{name} -%{python3_sitearch}/openmpi/PyNEST-%{version}-py3.?.egg-info -%{python3_sitearch}/openmpi/Topology-%{version}-py3.?.egg-info +%{python3_sitearch}/openmpi/PyNEST-nest_%{version}-py3.?.egg-info +%{python3_sitearch}/openmpi/Topology-nest_%{version}-py3.?.egg-info %endif
%changelog +* Fri Jul 19 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.18.0-1 +- Update to 2.18 +- Re-enable 32bit arches +- Update patch +- Drop py2 support + * Sun Feb 17 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 2.16.0-11 - Rebuild for readline 8.0
diff --git a/sources b/sources index e60bd23..7868ae1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nest-2.16.0.tar.gz) = b929f14796989f9b9eaa4e641ef531cbe016b025bbeb25d51af75b44e7fd2b2acd2b1ce117bcf27f57752568626adb8836c1d49186cc993c57e06c62d867454b +SHA512 (nest-2.18.0.tar.gz) = 69d6460afaaa252432b2d64ab3200b35fca9535607a234772cad19a161fefbdec23fbde632c5823205f461f8112bf06a1d54db4f6dfec492c33615c483502ffa