diff --git a/.gitignore b/.gitignore index 91a7093..fe292ed 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,3 @@ /arbor-fb5d4ea.tar.gz /arbor-0.3.tar.gz /arbor-0.5.2.tar.gz -/arbor-0.6.tar.gz -/arbor-0.7.tar.gz -/arbor-0.9.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index d8b371c..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,13 +0,0 @@ -upstream_project_url: https://github.com/arbor-sim/arbor -upstream_tag_template: v{version} - -jobs: - - job: pull_from_upstream - trigger: release - dist_git_branches: - - fedora-rawhide - - job: koji_build - - trigger: commit - dist_git_branches: - - fedora-all diff --git a/0001-Fix-a-few-typos-that-cause-failure-to-compile-with-G.patch b/0001-Fix-a-few-typos-that-cause-failure-to-compile-with-G.patch deleted file mode 100644 index d337a29..0000000 --- a/0001-Fix-a-few-typos-that-cause-failure-to-compile-with-G.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8880ff435f69b515a57e60e8b7434dad9e47847e Mon Sep 17 00:00:00 2001 -From: "Benjamin A. Beasley" -Date: Thu, 16 Jan 2025 09:49:20 -0500 -Subject: [PATCH] Fix a few typos that cause failure to compile with GCC 15 - -These were eventually included in -76120d16c00ae67128c3c69421ab712f985f3445, along with many other changes. ---- - arbor/include/arbor/util/expected.hpp | 2 +- - python/strprintf.hpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arbor/include/arbor/util/expected.hpp b/arbor/include/arbor/util/expected.hpp -index 9d860f65..1af88eb4 100644 ---- a/arbor/include/arbor/util/expected.hpp -+++ b/arbor/include/arbor/util/expected.hpp -@@ -486,7 +486,7 @@ struct expected { - // Swap ops. - - void swap(expected& other) { -- data_.swap(other.data); -+ data_.swap(other.data_); - } - - // Accessors. -diff --git a/python/strprintf.hpp b/python/strprintf.hpp -index 63801677..2ccf12c1 100644 ---- a/python/strprintf.hpp -+++ b/python/strprintf.hpp -@@ -168,7 +168,7 @@ namespace impl { - for (auto& x: s.seq_) { - if (!first) o << s.sep_; - first = false; -- o << s.f(x); -+ o << s.f_(x); - } - return o; - } --- -2.47.1 - diff --git a/0001-Quote-various-cmake-var-values.patch b/0001-Quote-various-cmake-var-values.patch deleted file mode 100644 index ac8fb39..0000000 --- a/0001-Quote-various-cmake-var-values.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 02bb37946cafdb5892c04a2e9804566c3d36e8a0 Mon Sep 17 00:00:00 2001 -From: "Ankur Sinha (Ankur Sinha Gmail)" -Date: Mon, 29 Aug 2022 17:22:11 +0100 -Subject: [PATCH] Quote various cmake var values - ---- - cmake/arbor-config.cmake.in | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/cmake/arbor-config.cmake.in b/cmake/arbor-config.cmake.in -index c9edecdc..7b6e1391 100644 ---- a/cmake/arbor-config.cmake.in -+++ b/cmake/arbor-config.cmake.in -@@ -46,11 +46,11 @@ endfunction() - - set(ARB_VECTORIZE @ARB_VECTORIZE@) - set(ARB_WITH_GPU @ARB_WITH_GPU@) --set(ARB_ARCH @ARB_ARCH@) --set(ARB_MODCC_FLAGS @ARB_MODCC_FLAGS@) --set(ARB_CXX @CMAKE_CXX_COMPILER@) --set(ARB_CXX_FLAGS @CMAKE_CXX_FLAGS@) --set(ARB_CXX_FLAGS_TARGET @ARB_CXX_FLAGS_TARGET_FULL@) -+set(ARB_ARCH "@ARB_ARCH@") -+set(ARB_MODCC_FLAGS "@ARB_MODCC_FLAGS@") -+set(ARB_CXX "@CMAKE_CXX_COMPILER@") -+set(ARB_CXX_FLAGS "@CMAKE_CXX_FLAGS@") -+set(ARB_CXX_FLAGS_TARGET "@ARB_CXX_FLAGS_TARGET_FULL@") - - _append_property(arbor::arbor INTERFACE_LINK_LIBRARIES @arbor_add_import_libs@) - _append_property(arbor::arborenv INTERFACE_LINK_LIBRARIES @arborenv_add_import_libs@) --- -2.37.2 - diff --git a/arbor-0.9.0-pybind11-3.0.patch b/arbor-0.9.0-pybind11-3.0.patch deleted file mode 100644 index 6fc58db..0000000 --- a/arbor-0.9.0-pybind11-3.0.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur arbor-0.9.0-original/python/pyarb.hpp arbor-0.9.0/python/pyarb.hpp ---- arbor-0.9.0-original/python/pyarb.hpp 2023-08-10 10:47:38.000000000 +0100 -+++ arbor-0.9.0/python/pyarb.hpp 2025-11-03 08:24:00.093256311 +0000 -@@ -13,18 +13,6 @@ - - #include - --// Version check --#define mk_tok(x) #x --#define mk_ver(M, m, p) mk_tok(M) "." mk_tok(m) "." mk_tok(p) --#define PB11_ERR(M, m, p) "Required version of pybind11 is 2.8.1 <= version < 3.0.0 Found " mk_ver(M, m, p) --static_assert((PYBIND11_VERSION_HEX >= 0x02080100) -- && -- (PYBIND11_VERSION_HEX < 0x03000000), -- PB11_ERR(PYBIND11_VERSION_MAJOR, PYBIND11_VERSION_MINOR, PYBIND11_VERSION_PATCH)); --#undef PB11_ERR --#undef mk_ver --#undef mk_tok -- - namespace pyarb { - - // Sample recorder object interface. diff --git a/arbor.spec b/arbor.spec index 8e76de4..f5bcd85 100644 --- a/arbor.spec +++ b/arbor.spec @@ -14,21 +14,15 @@ Documentation is available at https://arbor.readthedocs.io/en/latest/ } # Best to start with the serial version when debugging build failures -%bcond mpich 1 -%bcond openmpi 1 +%bcond_without mpich +%bcond_without openmpi -%bcond tests 1 - -# Python unit tests in MPI environment fail in a non-deterministic way. -# Using pytest _as is_ doesn't work either and `-m unittest` does not -# allow filtering tests as `pytest -k` does. -# For now we don't run the Python MPI tests. -%bcond mpi_py_unittest 0 +%bcond_without tests %global forgeurl https://github.com/arbor-sim/arbor Name: arbor -Version: 0.9.0 +Version: 0.5.2 Release: %autorelease Summary: Multi-compartment neural network simulation library @@ -39,28 +33,16 @@ Source0: %forgesource # script to run examples Source1: https://raw.githubusercontent.com/arbor-sim/arbor/master/scripts/run_python_examples.sh Source2: https://raw.githubusercontent.com/arbor-sim/arbor/master/scripts/run_cpp_examples.sh -License: BSD-3-Clause +License: BSD -Patch: 0001-Quote-various-cmake-var-values.patch -# Tests are failing to compile due to some missing includes -Patch: fix-missing-includes.patch -# Fix a few typos that cause failure to compile with GCC 15 -# -# These were eventually included in -# 76120d16c00ae67128c3c69421ab712f985f3445, along with many other changes. -Patch: 0001-Fix-a-few-typos-that-cause-failure-to-compile-with-G.patch -# Remove the hard-coded pybind11 version check so that we can build with -# pybind11 3.0; this is part of https://github.com/arbor-sim/arbor/pull/2481. -Patch: arbor-0.9.0-pybind11-3.0.patch +# This patch changes ext/CMakeLists.txt for automatically using tinyopt libraries by cmake command. +#Patch1: arbor-tinyopt_cmake.patch -# Random123 does not support: -# mips64r2 mips32r2 s390 -# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -ExcludeArch: mips64r2 mips32r2 s390x %{ix86} +# Random123 does not support these +ExcludeArch: mips64r2 mips32r2 s390 BuildRequires: cmake BuildRequires: make -BuildRequires: fmt-devel BuildRequires: gcc-c++ BuildRequires: git-core BuildRequires: gtest-devel @@ -72,7 +54,7 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: Random123-devel BuildRequires: tclap-devel -BuildRequires: pugixml-devel +Provides: python3-arbor = %{version}-%{release} # For validation, but we don't have these BRs # BuildRequires: julia julia-sundials julia-unitful julia-JSON @@ -86,9 +68,6 @@ BuildRequires: %{py3_dist seaborn} # Required by arbor Requires: %{py3_dist numpy} -# Provide Python meta data for packages requiring arbor -%py_provides python3-arbor - %description %{_description} %package devel @@ -101,13 +80,11 @@ Provides: arbor-static = %{version}-%{release} %package doc # Does not require the main package, since it may be installed by people using # the MPI builds -Summary: Documentation for arbor +Summary: Documentation for arbor BuildRequires: python3-sphinx BuildRequires: python3-sphinx_rtd_theme BuildRequires: python3-svgwrite -BuildArch: noarch - %description doc %{_description} %if %{with mpich} @@ -157,10 +134,7 @@ Provides: arbor-openmpi-static = %{version}-%{release} %endif %prep -%forgeautosetup -p1 - -# correct catalogue location -sed -i 's|dummy-catalogue.so|lib/dummy-catalogue.so|' python/test/unit/test_catalogues.py +%forgesetup # Disable failing padded test sed -i '/test_padded.cpp/ d' test/unit/CMakeLists.txt @@ -185,9 +159,6 @@ find . -type f -name "CMakeLists.txt" -exec sed -i -e 's/ext-tclap//' -e 's/ext- # Correct Python shebangs in all files find . -type f -name "*" -exec sed -i 's|^#![ ]*/usr/bin/env.*python.*$|#!/usr/bin/python3|' {} 2>/dev/null ';' -# Fix shebang (special case) -sed -i 's|^#![ ]*/usr/env/bin.*python.*$|#!/usr/bin/python3|' example/lfp/neuron_lfp_example.py - # test scripts cp %{SOURCE1} scripts/ cp %{SOURCE2} scripts/ @@ -228,11 +199,18 @@ pushd build$MPI_COMPILE_TYPE && -DCMAKE_BUILD_TYPE:STRING="release" \\\ -DARB_USE_BUNDLED_LIBS:BOOL=OFF \\\ -DARB_USE_BUNDLED_PYBIND11:BOOL=OFF \\\ +%ifarch x86_64 i686 aarch64 + -DARB_VECTORIZE:BOOL=ON \\\ +%else -DARB_VECTORIZE:BOOL=OFF \\\ +%endif -DARB_WITH_MPI:BOOL=$MPI_YES \\\ -DARB_WITH_GPU:BOOL=OFF \\\ +%ifnarch s390x s390 + -DARB_ARCH:STRING="native" \\\ +%else -DARB_ARCH:STRING="none" \\\ - -DARB_CXX_FLAGS_TARGET:STRING="-ffat-lto-objects" \\\ +%endif -DCMAKE_INSTALL_LIBDIR=%{_lib} \\\ -DARB_WITH_PYTHON:BOOL=ON \\\ -DARB_PYTHON_LIB_PATH:STRING=$MPI_PYTHON3_SITEARCH \\\ @@ -259,9 +237,9 @@ popd || exit -1; } # Build serial version, dummy arguments +%global __cc gcc +%global __cxx g++ %set_build_flags -export CC=gcc -export CXX=g++ export MPI_SUFFIX="" export MPI_HOME=%{_prefix} export MPI_INCLUDE=%{_includedir} @@ -272,12 +250,17 @@ export MPI_PYTHON3_SITEARCH=%{python3_sitearch} %{do_cmake_config} %{do_make_build} -# skip building sphinx docs because they bundle js/fonts and it's very hard to -# unbundle +# Manually make docs in the serial build +sphinx-build-%{python3_version} -b html doc html +# Remove uneeded dotfiles +rm -rfv html/{.buildinfo,.doctrees} + # Build mpich version %if %{with mpich} %{_mpich_load} +%global __cc mpicc +%global __cxx mpicxx %set_build_flags export CC=mpicc export CXX=mpicxx @@ -294,6 +277,8 @@ export MPI_COMPILE_TYPE="-mpich" # Build OpenMPI version %if %{with openmpi} %{_openmpi_load} +%global __cc mpicc +%global __cxx mpicxx %set_build_flags export CC=mpicc export CXX=mpicxx @@ -339,8 +324,6 @@ export MPI_COMPILE_TYPE="-mpich" pushd $RPM_BUILD_ROOT/$MPI_BIN mv -v modcc{,$MPI_SUFFIX} -v - mv -v arbor-build-catalogue{,$MPI_SUFFIX} -v - mv -v lmorpho{,$MPI_SUFFIX} -v popd %{_mpich_unload} %endif @@ -358,58 +341,53 @@ export MPI_COMPILE_TYPE="-openmpi" pushd $RPM_BUILD_ROOT/$MPI_BIN mv -v modcc{,$MPI_SUFFIX} -v - mv -v arbor-build-catalogue{,$MPI_SUFFIX} -v - mv -v lmorpho{,$MPI_SUFFIX} -v popd %{_openmpi_unload} %endif -# https://github.com/arbor-sim/arbor/blob/master/.github/workflows/test-matrix.yml +# https://github.com/arbor-sim/arbor/blob/master/.github/workflows/basic.yml %if %{with tests} %check - -# Taken from upstream's GitHub workflow -%global mpirun mpirun -n %{_smp_build_ncpus} +# General tests +export PYTHONPATH="%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}" # these tests segfault, filter out -gtest_filter="${gtest_filter--}${gtest_filter+:}*diffusion*" - pushd build-serial - %{py3_test_envvars} %{python3} -m unittest discover -v -s ../python - ./bin/unit ${gtest_filter+--gtest_filter=}${gtest_filter-} + %{python3} ../python/test/unit/runner.py -v2 + ./bin/unit ./bin/unit-modcc cp ../scripts/run_cpp_examples.sh . ./run_cpp_examples.sh popd +./scripts/run_python_examples.sh # MPICH %if %{with mpich} %{_mpich_load} +export PYTHONPATH="%{buildroot}/$MPI_PYTHON3_SITEARCH" pushd build-mpich -%if %{with mpi_py_unittest} - %{py3_test_envvars} %{mpirun} %{python3} -m unittest discover -v -s ../python -%endif - %{mpirun} ./bin/unit-mpi + #./bin/unit --gtest_filter=-*mc_event_delivery*:*fvm_lowered*:*mc_cell_group* + mpirun -n %{_smp_build_ncpus} %{python3} ../python/test/unit_distributed/runner.py -v2 + mpirun -n %{_smp_build_ncpus} ./bin/unit-mpi cp ../scripts/run_cpp_examples.sh . - ./run_cpp_examples.sh "%{mpirun}" + ./run_cpp_examples.sh "mpirun -n %{_smp_build_ncpus}" popd -%{py3_test_envvars} ./scripts/run_python_examples.sh "%{mpirun}" +./scripts/run_python_examples.sh "mpirun -n %{_smp_build_ncpus}" %{_mpich_unload} %endif # OpenMPI %if %{with openmpi} %{_openmpi_load} +export PYTHONPATH="%{buildroot}/$MPI_PYTHON3_SITEARCH" pushd build-openmpi -%if %{with mpi_py_unittest} - %{py3_test_envvars} %{mpirun} %{python3} -m unittest discover -v -s ../python -%endif - %{mpirun} ./bin/unit-mpi + mpirun -n %{_smp_build_ncpus} %{python3} ../python/test/unit_distributed/runner.py -v2 + mpirun -n %{_smp_build_ncpus} ./bin/unit-mpi cp ../scripts/run_cpp_examples.sh . - ./run_cpp_examples.sh "%{mpirun}" + ./run_cpp_examples.sh "mpirun -n %{_smp_build_ncpus}" popd -%{py3_test_envvars} ./scripts/run_python_examples.sh "%{mpirun}" +./scripts/run_python_examples.sh "mpirun -n %{_smp_build_ncpus}" %{_openmpi_unload} %endif %endif @@ -419,10 +397,7 @@ popd %license LICENSE ext/tinyopt/LICENSE-tinyopt %doc README.md %{_bindir}/modcc -%{_bindir}/arbor-build-catalogue -%{_bindir}/lmorpho %{python3_sitearch}/arbor -%{_datadir}/arbor %files devel @@ -436,7 +411,7 @@ popd %files doc %license LICENSE -%doc example/ +%doc html %if %{with mpich} @@ -444,10 +419,7 @@ popd %doc README.md %license LICENSE ext/tinyopt/LICENSE-tinyopt %{_libdir}/mpich/bin/modcc_mpich -%{_libdir}/mpich/bin/arbor-build-catalogue_mpich -%{_libdir}/mpich/bin/lmorpho_mpich %{python3_sitearch}/mpich/arbor -%{_libdir}/mpich/share/arbor %files mpich-devel %{_libdir}/mpich/include/arbor @@ -464,10 +436,7 @@ popd %doc README.md %license LICENSE ext/tinyopt/LICENSE-tinyopt %{_libdir}/openmpi/bin/modcc_openmpi -%{_libdir}/openmpi/bin/arbor-build-catalogue_openmpi -%{_libdir}/openmpi/bin/lmorpho_openmpi %{python3_sitearch}/openmpi/arbor -%{_libdir}/openmpi/share/arbor %files openmpi-devel %{_libdir}/openmpi/include/arbor @@ -481,3 +450,78 @@ popd %changelog %autochangelog + +* Wed Jul 21 2021 Fedora Release Engineering - 0.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.3-9 +- Rebuilt for Python 3.10 + +* Tue Jan 26 2021 Fedora Release Engineering - 0.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Oct 05 2020 Ankur Sinha - 0.3-7 +- Explicitly require setuptools + +* Fri Aug 28 2020 Jeff Law - 0.3-6 +- Re-enable LTO +- Do not force -march=native on armv7hl so that build architecture does not bleed + into the binaries. This should probably be done on all targets + +* Sat Aug 01 2020 Fedora Release Engineering - 0.3-5 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Jeff Law - 0.3-4 +- Disable LTO for armv7hl build + +* Mon Jul 27 2020 Fedora Release Engineering - 0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun Jun 28 2020 Ankur Sinha - 0.3-2 +- Update build flags to ensure CC and CXX are set correctly +- https://lists.fedoraproject.org/archives/list/scitech@lists.fedoraproject.org/thread/BNKLXKY4O7BOTZ7LH7XDUTQO6FG2UWUT/#BNKLXKY4O7BOTZ7LH7XDUTQO6FG2UWUT + +* Mon Jun 08 2020 Antonio Trande - 0.3-2 +- Move Provides lines to runtime packages +- Add patch for using tinyopt libraries + +* Sat Jun 06 2020 Antonio Trande - 0.3-1 +- Release 0.3 + +* Tue May 26 2020 Miro Hrončok - 0.2.2-8.20200225gitfb5d4ea736282dce14c3284bc5db748b082db957 +- Rebuilt for Python 3.9 + +* Thu Apr 02 2020 Björn Esser - 0.2.2-7.20200225gitfb5d4ea736282dce14c3284bc5db748b082db957 +- Fix string quoting for rpm >= 4.16 + +* Wed Feb 26 2020 Ankur Sinha - 0.2.2-5.20200226gitfb5d4ea736282dce14c3284bc5db748b082db957 +- Use new snapshot that fixes errors on 32 bit systems +- No longer excludes i686 and armv7hl +- Drop unneeded patch. + +* Sun Feb 23 2020 Ankur Sinha - 0.2.2-5.20200223gitf12f934f365d9e68f01bfd857982be80da2ddd10 +- Build from latest upstream snapshot +- Freshen patch +- Add exclude arches + +* Tue Jan 28 2020 Fedora Release Engineering - 0.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Dec 10 2019 Ankur Sinha - 0.2.2-3 +- Enable tests +- Add patch for test crash + +* Mon Dec 09 2019 Ankur Sinha - 0.2.2-2 +- Remove arch info in provides for static +- Temporarily disable tests +- use python3-devel +- Add documentation in separate sub-package +- add python3-{mpich,openmpi} as requires that own MPI_PYTHON3_SITEARCH directories +- Improve summaries for sub-packages to please rpmlint + +* Sat Dec 07 2019 Ankur Sinha - 0.2.2-1 +- Update to latest release + +* Sun Jan 13 2019 Ankur Sinha - 0.1-1 +- Initial rpm package diff --git a/changelog b/changelog deleted file mode 100644 index 2bfa808..0000000 --- a/changelog +++ /dev/null @@ -1,75 +0,0 @@ -* Wed Jul 21 2021 Fedora Release Engineering - 0.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 0.3-9 -- Rebuilt for Python 3.10 - -* Tue Jan 26 2021 Fedora Release Engineering - 0.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Oct 05 2020 Ankur Sinha - 0.3-7 -- Explicitly require setuptools - -* Fri Aug 28 2020 Jeff Law - 0.3-6 -- Re-enable LTO -- Do not force -march=native on armv7hl so that build architecture does not bleed - into the binaries. This should probably be done on all targets - -* Sat Aug 01 2020 Fedora Release Engineering - 0.3-5 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Jeff Law - 0.3-4 -- Disable LTO for armv7hl build - -* Mon Jul 27 2020 Fedora Release Engineering - 0.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sun Jun 28 2020 Ankur Sinha - 0.3-2 -- Update build flags to ensure CC and CXX are set correctly -- https://lists.fedoraproject.org/archives/list/scitech@lists.fedoraproject.org/thread/BNKLXKY4O7BOTZ7LH7XDUTQO6FG2UWUT/#BNKLXKY4O7BOTZ7LH7XDUTQO6FG2UWUT - -* Mon Jun 08 2020 Antonio Trande - 0.3-2 -- Move Provides lines to runtime packages -- Add patch for using tinyopt libraries - -* Sat Jun 06 2020 Antonio Trande - 0.3-1 -- Release 0.3 - -* Tue May 26 2020 Miro Hrončok - 0.2.2-8.20200225gitfb5d4ea736282dce14c3284bc5db748b082db957 -- Rebuilt for Python 3.9 - -* Thu Apr 02 2020 Björn Esser - 0.2.2-7.20200225gitfb5d4ea736282dce14c3284bc5db748b082db957 -- Fix string quoting for rpm >= 4.16 - -* Wed Feb 26 2020 Ankur Sinha - 0.2.2-5.20200226gitfb5d4ea736282dce14c3284bc5db748b082db957 -- Use new snapshot that fixes errors on 32 bit systems -- No longer excludes i686 and armv7hl -- Drop unneeded patch. - -* Sun Feb 23 2020 Ankur Sinha - 0.2.2-5.20200223gitf12f934f365d9e68f01bfd857982be80da2ddd10 -- Build from latest upstream snapshot -- Freshen patch -- Add exclude arches - -* Tue Jan 28 2020 Fedora Release Engineering - 0.2.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Dec 10 2019 Ankur Sinha - 0.2.2-3 -- Enable tests -- Add patch for test crash - -* Mon Dec 09 2019 Ankur Sinha - 0.2.2-2 -- Remove arch info in provides for static -- Temporarily disable tests -- use python3-devel -- Add documentation in separate sub-package -- add python3-{mpich,openmpi} as requires that own MPI_PYTHON3_SITEARCH directories -- Improve summaries for sub-packages to please rpmlint - -* Sat Dec 07 2019 Ankur Sinha - 0.2.2-1 -- Update to latest release - -* Sun Jan 13 2019 Ankur Sinha - 0.1-1 -- Initial rpm package - diff --git a/fix-missing-includes.patch b/fix-missing-includes.patch deleted file mode 100644 index edfda30..0000000 --- a/fix-missing-includes.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fa15938c196bf317e0292d41ec7d341978e9ed08 Mon Sep 17 00:00:00 2001 -From: Sandro -Date: Mon, 29 Apr 2024 14:35:01 +0200 -Subject: [PATCH] Fix missing includes - -Tests are failing to compile without those. - -diff --git a/test/unit/common.hpp b/test/unit/common.hpp -index db75e4d1..e02b9df2 100644 ---- a/test/unit/common.hpp -+++ b/test/unit/common.hpp -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - - #include - -diff --git a/test/unit/test_event_queue.cpp b/test/unit/test_event_queue.cpp -index daa0ccb9..17c10378 100644 ---- a/test/unit/test_event_queue.cpp -+++ b/test/unit/test_event_queue.cpp -@@ -6,6 +6,7 @@ - #include - - #include "event_queue.hpp" -+#include "common.hpp" - - using namespace arb; - -diff --git a/test/unit/test_ordered_forest.cpp b/test/unit/test_ordered_forest.cpp -index c58c76a4..12f7bd31 100644 ---- a/test/unit/test_ordered_forest.cpp -+++ b/test/unit/test_ordered_forest.cpp -@@ -5,6 +5,7 @@ - - #include - #include "util/ordered_forest.hpp" -+#include "common.hpp" - - using arb::util::ordered_forest; - diff --git a/sources b/sources index 2f80fee..7e44b21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (arbor-0.9.0.tar.gz) = fa0280cae870c150c8f891949da9d6276f672bb7191b7b982cda4695dd38e3bffdd0dfa5f3acc2cf940909f64eb9da04cd11aeb7a4baa262fdbcd99be618aa15 +SHA512 (arbor-0.5.2.tar.gz) = f53ff1d1e2fb5a00c941e5e44db73ca4cd96db1d7f22b88473b8c65569e3e50a73126d04c2fa1b583730c0760362b1172b114fccb49becd10daa8dc5d1ec07be