From 4c00d82ed29b0ddf0e1ddf7530d589c8aabed2a3 Mon Sep 17 00:00:00 2001 From: Ankur Sinha (Ankur Sinha Gmail) Date: Dec 01 2020 10:25:30 +0000 Subject: Fix version generation --- diff --git a/0001-Unbundle-Random123.patch b/0001-Unbundle-Random123.patch index 38089d0..62fc89b 100644 --- a/0001-Unbundle-Random123.patch +++ b/0001-Unbundle-Random123.patch @@ -1,7 +1,7 @@ From e5a37f7aeef5d7573e2c9aebf33193ee2be00885 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Thu, 26 Nov 2020 20:04:49 +0000 -Subject: [PATCH 1/5] Unbundle Random123 +Subject: [PATCH 1/6] Unbundle Random123 --- configure.ac | 2 +- diff --git a/0002-Unbundle-catch.patch b/0002-Unbundle-catch.patch index c976069..2065b11 100644 --- a/0002-Unbundle-catch.patch +++ b/0002-Unbundle-catch.patch @@ -1,7 +1,7 @@ From 44b83113ecc41ea61e3bea32a626358a03ce7ac3 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Wed, 19 Aug 2020 09:26:49 +0100 -Subject: [PATCH 2/5] Unbundle catch +Subject: [PATCH 2/6] Unbundle catch --- CMakeLists.txt | 9 +++------ diff --git a/0003-Disable-python-build-and-install.patch b/0003-Disable-python-build-and-install.patch index d0a964c..f55bd83 100644 --- a/0003-Disable-python-build-and-install.patch +++ b/0003-Disable-python-build-and-install.patch @@ -1,7 +1,7 @@ From cd1a67114bcaa4bc60af397891658758ae2e594a Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Wed, 19 Aug 2020 09:48:56 +0100 -Subject: [PATCH 3/5] Disable python build and install +Subject: [PATCH 3/6] Disable python build and install --- src/nrnpython/CMakeLists.txt | 34 ---------------------------------- diff --git a/0004-Set-soversions-for-libs.patch b/0004-Set-soversions-for-libs.patch index 6b0d16e..b0155e8 100644 --- a/0004-Set-soversions-for-libs.patch +++ b/0004-Set-soversions-for-libs.patch @@ -1,7 +1,7 @@ From f6483765ba2cf521f19a1dd3f664f00293a176ee Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Wed, 19 Aug 2020 11:29:07 +0100 -Subject: [PATCH 4/5] Set soversions for libs +Subject: [PATCH 4/6] Set soversions for libs --- CMakeLists.txt | 5 +++++ diff --git a/0005-Correct-librxdmath-path-for-64bit.patch b/0005-Correct-librxdmath-path-for-64bit.patch index a327726..da1345a 100644 --- a/0005-Correct-librxdmath-path-for-64bit.patch +++ b/0005-Correct-librxdmath-path-for-64bit.patch @@ -1,7 +1,7 @@ From e6d577b6055dfc460204ff1c17a9bd89cc078f1a Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Thu, 8 Oct 2020 21:32:44 +0100 -Subject: [PATCH 5/5] Correct librxdmath path for 64bit +Subject: [PATCH 5/6] Correct librxdmath path for 64bit --- share/lib/python/neuron/rxd/rxd.py | 5 ++++- diff --git a/0006-Do-not-generate-version-info-at-buildtime.patch b/0006-Do-not-generate-version-info-at-buildtime.patch new file mode 100644 index 0000000..1ea47c2 --- /dev/null +++ b/0006-Do-not-generate-version-info-at-buildtime.patch @@ -0,0 +1,36 @@ +From 08bb355032377f4074e111fbb466eb23beafa11b Mon Sep 17 00:00:00 2001 +From: "Ankur Sinha (Ankur Sinha Gmail)" +Date: Tue, 1 Dec 2020 10:04:04 +0000 +Subject: [PATCH 6/6] Do not generate version info at buildtime + +--- + src/nrniv/CMakeLists.txt | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/src/nrniv/CMakeLists.txt b/src/nrniv/CMakeLists.txt +index 4e48565c..60c7d1e4 100644 +--- a/src/nrniv/CMakeLists.txt ++++ b/src/nrniv/CMakeLists.txt +@@ -132,19 +132,6 @@ set(NRN_INCLUDE_DIRS + # ============================================================================= + # Helper commands : generate various headers + # ============================================================================= +-# ~~~ +-# generate version information file +-# nrnversion.h does not depend on another file but on the output of +-# git2version_h.sh and nrnversion.h should only be changed if that output +-# is different from the contents of nrnversion.h +-# ~~~ +-add_custom_target( +- nrnversion_h ${PROJECT_SOURCE_DIR}/git2nrnversion_h.sh ${PROJECT_SOURCE_DIR} > nrnversion.h.tmp +- COMMAND ${CMAKE_COMMAND} -E copy_if_different nrnversion.h.tmp ${NRN_NRNOC_SRC_DIR}/nrnversion.h +- DEPENDS ${PROJECT_SOURCE_DIR}/git2nrnversion_h.sh) +- +-add_custom_command(OUTPUT ${NRN_NRNOC_SRC_DIR}/nrnversion.h DEPENDS nrnversion_h) +- + # avoid error with nvector_serial.c for #include <../../../nrnconf.h> + file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/src/sundials/shared) + +-- +2.28.0 + diff --git a/neuron.spec b/neuron.spec index 25b388f..38fda61 100644 --- a/neuron.spec +++ b/neuron.spec @@ -25,7 +25,7 @@ Please install the %{name}-devel package to compile nmodl files and so on. Name: neuron Version: 7.8.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A flexible and powerful simulator of neurons and networks License: GPLv3+ @@ -46,6 +46,8 @@ Patch3: 0004-Set-soversions-for-libs.patch # Set the right path for libdir # Upstreamable Patch4: 0005-Correct-librxdmath-path-for-64bit.patch +# stop build scripts from generating version during build +Patch5: 0006-Do-not-generate-version-info-at-buildtime.patch # Quite a lot of files have been dropped in 7.8.1 # https://github.com/neuronsimulator/nrn/issues/719 @@ -181,13 +183,13 @@ rm -rf src/Random123 rm -rf src/readline # Create version file ourselves +# To create this, we run the git2version.sh script in a checked out copy of neuron export TIMESTAMP=$(date +%Y-%m-%d) -export COMMIT=%{shortcommit} cat > src/nrnoc/nrnversion.h << EOF #define GIT_DATE "$TIMESTAMP" #define GIT_BRANCH "master" -#define GIT_CHANGESET "$COMMIT" -#define GIT_DESCRIBE "Neuron built for Fedora" +#define GIT_CHANGESET "da13bb7c" +#define GIT_DESCRIBE "7.8.1-1-gda13bb7c (Fedora %{fedora})" EOF # Use system libtool instead of a local copy that neuron tries to install @@ -542,6 +544,12 @@ export MY_CMAKE_BUILDDIR="%_vpath_builddir""-openmpi" %endif %changelog +* Mon Nov 30 2020 Ankur Sinha - 7.8.1-7 +- Fix version info + +* Mon Nov 23 2020 Ankur Sinha - 7.8.1-6 +- Bumpspec + * Mon Nov 23 2020 Ankur Sinha - 7.8.1-5 - Enable mpi builds