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=cb7e44afcdb3f9e3....
Change: +ExcludeArch: armv7hl
Thanks.
Full change: ============
commit 1a7e0de456f71ea357c184b8016314ae9305cbb0 Author: Ankur Sinha (Ankur Sinha Gmail) sanjay.ankur@gmail.com Date: Fri Oct 5 19:51:30 2018 +0100
Add documentation links
diff --git a/README.md b/README.md index b3de5a2..ef2f742 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,7 @@
The neural simulation tool.
-Note: Nest 2.16 does not support 32 bit hardware -(https://github.com/nest/nest-simulator/issues/1031). +Note: [Nest 2.16 does not support 32 bit hardware](https://github.com/nest/nest-simulator/issues/1031).
Note: it is not yet built with `libneurosim` support, so all models may not be available in `PyNN`. @@ -68,3 +67,7 @@ Documentation ------------- The generated documentation is provided in the nest-doc package, and is common for all builds. + +Official documentation can be found at http://nest-simulator.org/ + +For issues with this package, please contact the [NeuroFedora SIG](https://fedoraproject.org/wiki/SIGs/NeuroFedora#Communication_and_getting_he...).
commit 0ee54cac027142bff74577aadd1f01d5429d8111 Author: Ankur Sinha (Ankur Sinha Gmail) sanjay.ankur@gmail.com Date: Fri Oct 5 19:48:22 2018 +0100
Correct readme syntax
diff --git a/README.md b/README.md index 4f204a9..b3de5a2 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@
The neural simulation tool.
-Note: `Nest 2.16 does not support 32 bit hardware https://github.com/nest/nest-simulator/issues/1031`__. +Note: Nest 2.16 does not support 32 bit hardware +(https://github.com/nest/nest-simulator/issues/1031).
Note: it is not yet built with `libneurosim` support, so all models may not be available in `PyNN`.
commit 6c61f2c34bede47db5c91a5ae0021a9ab9740e2b Author: Ankur Sinha (Ankur Sinha Gmail) sanjay.ankur@gmail.com Date: Fri Oct 5 19:47:05 2018 +0100
Update readme
diff --git a/README.md b/README.md index 9af1091..4f204a9 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@
The neural simulation tool.
+Note: `Nest 2.16 does not support 32 bit hardware https://github.com/nest/nest-simulator/issues/1031`__. + Note: it is not yet built with `libneurosim` support, so all models may not be available in `PyNN`.
@@ -39,10 +41,10 @@ The `nest_vars.sh` file is located in:
For MPICH builds:
-`source /usr/lib{,64}/mpich/bin/nest_vars.sh` +`source /usr/lib64/mpich/bin/nest_vars.sh`
For OpenMPI builds: -`source /usr/lib{,64}/openmpi/bin/nest_vars.sh` +`source /usr/lib64/openmpi/bin/nest_vars.sh`
For non MPI builds: @@ -51,11 +53,11 @@ For non MPI builds: To use an MPI build of NEST, one must also load the appropriate module. For MPICH builds:
-`module load mpi/mpich-{i686,x86_64}` +`module load mpi/mpich-$arch # $arch is the architecture, for example x86_64`
For OpenMPI builds:
-`module load mpi/openmpi-{i686,x86_64}` +`module load mpi/openmpi-$arch # $arch is the architecture, for example x86_64`
It is generally easier to add these lines to the `~/.bashrc` file (for bash users) so that these commands are automatically run on each login.
commit cb7e44afcdb3f9e39ec8093b0f38cda5bc111f2d Author: Ankur Sinha (Ankur Sinha Gmail) sanjay.ankur@gmail.com Date: Fri Oct 5 19:23:43 2018 +0100
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/%%7Bname%7D/%%7Bname%7D-simulator/archive/%%7Bgittag%7D/%...
+# 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
commit 539ebce738b1f24abc34cb653e34f03051bd118f Author: Ankur Sinha (Ankur Sinha Gmail) sanjay.ankur@gmail.com Date: Sat Sep 15 21:42:54 2018 +0100
Update to the latest release
Build currently fails: https://koji.fedoraproject.org/koji/taskinfo?taskID=29691341
https://github.com/nest/nest-simulator/issues/1031
To be fixed and built
diff --git a/.gitignore b/.gitignore index b463428..7c489ab 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /nest-2.14.0.tar.gz +/nest-2.16.0.tar.gz diff --git a/nest-0000-disable-python-build-install.patch b/nest-0000-disable-python-build-install.patch index 831da83..759f8e0 100644 --- a/nest-0000-disable-python-build-install.patch +++ b/nest-0000-disable-python-build-install.patch @@ -1,9 +1,7 @@ -diff --git a/extras/ConnPlotter/CMakeLists.txt b/extras/ConnPlotter/CMakeLists.txt -index 1f7c2b32..53be3fe1 100644 ---- a/extras/ConnPlotter/CMakeLists.txt -+++ b/extras/ConnPlotter/CMakeLists.txt -@@ -18,14 +18,14 @@ - # along with NEST. If not, see http://www.gnu.org/licenses/. +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( @@ -25,11 +23,10 @@ index 1f7c2b32..53be3fe1 100644
install( FILES examples/connplotter_tutorial.py DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples/ConnPlotter -diff --git a/pynest/CMakeLists.txt b/pynest/CMakeLists.txt -index 76482e01..0fc0c126 100644 ---- a/pynest/CMakeLists.txt -+++ b/pynest/CMakeLists.txt -@@ -72,14 +72,14 @@ if ( HAVE_PYTHON ) +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 )
@@ -52,12 +49,11 @@ index 76482e01..0fc0c126 100644 install( TARGETS pynestkernel DESTINATION ${PYEXECDIR}/nest/ ) install( FILES ${PROJECT_BINARY_DIR}/pynest/do_tests.py DESTINATION ${CMAKE_INSTALL_DATADIR}/extras -diff --git a/topology/CMakeLists.txt b/topology/CMakeLists.txt -index da4fb703..3b9848e3 100644 ---- a/topology/CMakeLists.txt -+++ b/topology/CMakeLists.txt -@@ -81,14 +81,14 @@ install( FILES ${topo_mpitests} - ) +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( diff --git a/nest-0001-disable-helpindex-update.patch b/nest-0001-disable-helpindex-update.patch index 7fffedc..301a667 100644 --- a/nest-0001-disable-helpindex-update.patch +++ b/nest-0001-disable-helpindex-update.patch @@ -1,23 +1,22 @@ -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index 58c8d422..1db8759f 100644 ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -47,12 +47,12 @@ if ( NOT CMAKE_CROSSCOMPILING ) - ) - # Update the global help index to contain all help files that are - # located 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 -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 b97b772..529ccd7 100644 --- a/nest.spec +++ b/nest.spec @@ -13,11 +13,11 @@ %global run_tests 0
Name: nest -Version: 2.14.0 +Version: 2.16.0
%global gittag v%{version}
-Release: 4%{?dist} +Release: 1%{?dist} Summary: The neural simulation tool
License: GPLv2+ @@ -714,6 +714,9 @@ export MPI_SITEARCH=$MPI_PYTHON3_SITEARCH %endif
%changelog +* Sat Sep 15 2018 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.16.0-1 +- Update to latest upstream release + * Fri Jul 27 2018 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.14.0-4 - Improve readme - Disable tests for the time being while I check builds diff --git a/sources b/sources index 8576bfb..e60bd23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nest-2.14.0.tar.gz) = 968efa6877677a76da8fb24b4584f333dc22ae46f1f3b7daed705f7fae21d77d8bc07732dc121157b676b5f2f0ad39146be2418826193406a3ab7ffcbb65406a +SHA512 (nest-2.16.0.tar.gz) = b929f14796989f9b9eaa4e641ef531cbe016b025bbeb25d51af75b44e7fd2b2acd2b1ce117bcf27f57752568626adb8836c1d49186cc993c57e06c62d867454b
arch-excludes@lists.fedoraproject.org