diff --git a/smoldyn-use_boost169.patch b/smoldyn-use_boost169.patch new file mode 100644 index 0000000..2557f9c --- /dev/null +++ b/smoldyn-use_boost169.patch @@ -0,0 +1,7 @@ +--- CMakeLists.orig.txt 2020-05-25 11:24:42.754220000 +0200 ++++ CMakeLists.txt 2020-05-25 11:25:53.945372024 +0200 +@@ -430,3 +430,3 @@ + +- set(Boost_INCLUDE_DIR ${INCLUDE_INSTALL_DIR}/boost) ++ set(Boost_INCLUDE_DIR ${INCLUDE_INSTALL_DIR}/boost169/boost) + include_directories(SYSTEM ${Boost_INCLUDE_DIR}) diff --git a/smoldyn.spec b/smoldyn.spec index 1be0878..391c039 100644 --- a/smoldyn.spec +++ b/smoldyn.spec @@ -15,7 +15,7 @@ Name: smoldyn Summary: A particle-based spatial stochastic simulator Version: 2.61 -Release: 1%{?dist} +Release: 2%{?dist} # The rxnparam.c and SurfaceParam.c source code files are in the public domain. # @@ -34,7 +34,8 @@ Source0: %{url}/%{name}-%{version}.zip Patch0: %{name}-fix_libpaths.patch Patch1: %{name}-freeglut.patch -BuildRequires: boost-devel +Patch2: %{name}-use_boost169.patch + BuildRequires: cmake3 BuildRequires: gcc BuildRequires: %{?dts}gcc-c++ @@ -42,6 +43,9 @@ BuildRequires: %{?dts}gcc-c++ BuildRequires: %{?dts}toolchain, %{?dts}libatomic-devel BuildRequires: boost169-devel %endif +%if 0%{?fedora} || 0%{?rhel} > 7 +BuildRequires: boost-devel +%endif BuildRequires: freeglut-devel BuildRequires: libXmu-devel BuildRequires: libXi-devel @@ -94,6 +98,9 @@ BuildArch: noarch %if 0%{?fedora} %patch1 -p0 -b .freeglut %endif +%if 0%{?rhel} && 0%{?rhel} == 7 +%patch2 -p0 -b .use_boost169 +%endif # Copy license file mv source/lib/SFMT/LICENSE.txt source/lib/SFMT/SFMT-LICENSE.txt @@ -178,6 +185,9 @@ popd %doc documentation/* %changelog +* Mon May 25 2020 Antonio Trande - 2.61-2 +- Patched for using Boost169 on EPEL7 + * Sun May 24 2020 Antonio Trande - 2.61-1 - Release 2.61