From 9dd81d3b8ee3b6f8fe0e76f6754fcc3d303632ff Mon Sep 17 00:00:00 2001 From: Ankur Sinha (Ankur Sinha Gmail) Date: Jun 23 2019 18:00:30 +0000 Subject: Improve patch to install all headers --- diff --git a/0004-Install-all-headers.patch b/0004-Install-all-headers.patch index 893ca71..7677cd0 100644 --- a/0004-Install-all-headers.patch +++ b/0004-Install-all-headers.patch @@ -1,4 +1,4 @@ -From 69b24f44f1bf0b5ee8d76c81b190832b60d2864d Mon Sep 17 00:00:00 2001 +From 3b8051545b49878a3f0ab917408f64e5f259b4bb Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Sun, 23 Jun 2019 18:19:28 +0100 Subject: [PATCH 4/6] Install all headers @@ -12,17 +12,17 @@ Subject: [PATCH 4/6] Install all headers src/ni_pci_6229/Makefile.am | 2 +- src/nmodl/Makefile.am | 2 +- src/nrniv/Makefile.am | 2 +- - src/nrnoc/Makefile.am | 2 +- + src/nrnoc/Makefile.am | 5 +---- src/nrnpython/Makefile.am | 2 +- - src/oc/Makefile.am | 2 +- + src/oc/Makefile.am | 6 +----- src/readline/Makefile.am | 2 +- - src/scopmath/Makefile.am | 2 +- - src/sparse13/Makefile.am | 2 +- + src/scopmath/Makefile.am | 3 +-- + src/sparse13/Makefile.am | 3 +-- src/sundials/cvodes/Makefile.am | 2 +- src/sundials/ida/Makefile.am | 2 +- src/sundials/shared/Makefile.am | 2 +- src/uxnrnbbs/Makefile.am | 2 +- - 18 files changed, 18 insertions(+), 18 deletions(-) + 18 files changed, 18 insertions(+), 27 deletions(-) diff --git a/src/gnu/Makefile.am b/src/gnu/Makefile.am index 533cf878..27f7d682 100755 @@ -126,15 +126,18 @@ index 97e9cdaf..45b48b8d 100755 linmod.h nrnste.h arraypool.h structpool.h \ kschan.h kssingle.h nonlinz.h nrnhash.h \ diff --git a/src/nrnoc/Makefile.am b/src/nrnoc/Makefile.am -index 8d38192b..25dea7db 100755 +index 8d38192b..154d3681 100755 --- a/src/nrnoc/Makefile.am +++ b/src/nrnoc/Makefile.am -@@ -104,7 +104,7 @@ pkginclude_HEADERS = neuron.h md1redef.h md2redef.h section.h nrnoc_ml.h \ - options.h nrnredef.h multisplit.h multicore.h nmodlmutex.h - - ## Header files that need to be included in the distribution but not installed: +@@ -101,10 +101,7 @@ hocusr.h: $(nsrc)/nrnoc/neuron.h $(nsrc)/oc/mk_hocusr_h.py $(nsrc)/nrnoc/options + ## Header files that need to be installed: + pkginclude_HEADERS = neuron.h md1redef.h md2redef.h section.h nrnoc_ml.h \ + cabvars.h membdef.h membfunc.h nrniv_mf.h nrn_ansi.h nrncvode.h \ +- options.h nrnredef.h multisplit.h multicore.h nmodlmutex.h +- +-## Header files that need to be included in the distribution but not installed: -noinst_HEADERS = hocusr.h \ -+pkginclude_HEADERS = hocusr.h \ ++ options.h nrnredef.h multisplit.h multicore.h nmodlmutex.h hocusr.h \ osxdlfcn.h osxdlfcn.c multicore.c \ nonvintblock.h nrndae_c.h @@ -152,15 +155,19 @@ index 1bf86d8c..52b452e3 100755 nrnpy_nrn_2.h nrnpy_nrn_3.h hoccontext.h \ nrnpy_utils.h rxd.h grids.h diff --git a/src/oc/Makefile.am b/src/oc/Makefile.am -index 7c673b85..fd5e3884 100755 +index 7c673b85..2e0d3640 100755 --- a/src/oc/Makefile.am +++ b/src/oc/Makefile.am -@@ -66,7 +66,7 @@ pkginclude_HEADERS = hoc.h hoclist.h hocdec.h hocassrt.h nrnisaac.h \ - - ## Header files that need to be copied into the distribution but do not need - ## to be installed: +@@ -62,11 +62,7 @@ oc_LDADD = libocxt.la liboc.la \ + pkginclude_HEADERS = hoc.h hoclist.h hocdec.h hocassrt.h nrnisaac.h \ + oc_ansi.h hocparse.h ocfunc.h ocmisc.h nrnjava.h hocgetsym.h \ + nrnpthread.h hoc_membf.h nrnran123.h scoplib_ansi.h nrnapi.h \ +- nrnassrt.h +- +-## Header files that need to be copied into the distribution but do not need +-## to be installed: -noinst_HEADERS = code.h equation.h hocmodl.h hocstr.h \ -+pkginclude_HEADERS = code.h equation.h hocmodl.h hocstr.h \ ++ nrnassrt.h code.h equation.h hocmodl.h hocstr.h \ profile.h redef.h parse.h mcran4.h nrnmpi.h nrnrt.h isaac64.h \ nrnfilewrap.h nrn_vsscanf.c classreg.h @@ -178,28 +185,34 @@ index 53dab988..60438d2c 100755 install-exec-hook: diff --git a/src/scopmath/Makefile.am b/src/scopmath/Makefile.am -index 6de7c306..93c2d15b 100755 +index 6de7c306..de8758e0 100755 --- a/src/scopmath/Makefile.am +++ b/src/scopmath/Makefile.am -@@ -14,7 +14,7 @@ libscopmath_la_SOURCES = abort.c adams.c adeuler.c adrunge.c advance.c \ +@@ -14,11 +14,10 @@ libscopmath_la_SOURCES = abort.c adams.c adeuler.c adrunge.c advance.c \ ssimplic_thread.c ## Header files that need to be included in the distribution: -noinst_HEADERS = errcodes.h f2c.h scopenv.h newton_struct.h -+pkginclude_HEADERS = errcodes.h f2c.h scopenv.h newton_struct.h ++pkginclude_HEADERS = errcodes.h f2c.h scopenv.h newton_struct.h scoplib.h EXTRA_DIST = scpmth.mak +-pkginclude_HEADERS = scoplib.h + + AM_CPPFLAGS = -DHOC=1 + AM_CFLAGS = @MINGW_CFLAG@ diff --git a/src/sparse13/Makefile.am b/src/sparse13/Makefile.am -index 04bcdd17..5a8d8341 100755 +index 04bcdd17..b99b98c3 100755 --- a/src/sparse13/Makefile.am +++ b/src/sparse13/Makefile.am -@@ -10,7 +10,7 @@ libsparse13_la_SOURCES = spalloc.c spbuild.c spfactor.c spoutput.c \ +@@ -8,9 +8,8 @@ libsparse13_la_SOURCES = spalloc.c spbuild.c spfactor.c spoutput.c \ + cspalloc.c cspbuild.c cspfactor.c cspoutput.c \ + cspsolve.c csputils.c - pkginclude_HEADERS = spmatrix.h spconfig.h cspmatrix.h cspredef.h +-pkginclude_HEADERS = spmatrix.h spconfig.h cspmatrix.h cspredef.h ++pkginclude_HEADERS = spmatrix.h spconfig.h cspmatrix.h cspredef.h spdefs.h -noinst_HEADERS = spdefs.h -+pkginclude_HEADERS = spdefs.h diff --git a/0005-Disable-python-bits-in-install-exec-hook.patch b/0005-Disable-python-bits-in-install-exec-hook.patch index fbcf796..92a18e6 100644 --- a/0005-Disable-python-bits-in-install-exec-hook.patch +++ b/0005-Disable-python-bits-in-install-exec-hook.patch @@ -1,4 +1,4 @@ -From 8efe1debbf55107a0b49754d8159de55792684b0 Mon Sep 17 00:00:00 2001 +From ab6649fc16e0d4a4c02b0697efd25a309502478f Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Wed, 19 Jun 2019 21:45:15 +0100 Subject: [PATCH 5/6] Disable python bits in install exec hook diff --git a/0006-Remove-duplicate-file-installation.patch b/0006-Remove-duplicate-file-installation.patch index fd4f9a6..e9c0e52 100644 --- a/0006-Remove-duplicate-file-installation.patch +++ b/0006-Remove-duplicate-file-installation.patch @@ -1,4 +1,4 @@ -From 4063feaca8f35071c0b93b7fb875d4b89e5b653b Mon Sep 17 00:00:00 2001 +From 7cd0cc04b21ef57b6e7d83adfe7a13f8cbb39125 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Sun, 23 Jun 2019 18:31:52 +0100 Subject: [PATCH 6/6] Remove duplicate file installation diff --git a/neuron.spec b/neuron.spec index cb15ed5..858be00 100644 --- a/neuron.spec +++ b/neuron.spec @@ -27,7 +27,7 @@ Please install the %{name}-devel package to compile nmodl files and so on. Name: neuron Version: 7.7.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A flexible and powerful simulator of neurons and networks License: GPLv3+ @@ -268,6 +268,9 @@ mv $RPM_BUILD_ROOT/%{_bindir}/oc $RPM_BUILD_ROOT/%{_bindir}/hoc %{_datadir}/%{tarname}/demo %changelog +* Sun Jun 23 2019 Ankur Sinha - 7.7.1-5 +- Improve patch to install all headers + * Sun Jun 23 2019 Ankur Sinha - 7.7.1-4 - Install all header files