update to 2.6.0b2 and kludge spec
This commit is contained in:
parent
0864d5cf55
commit
7dc49d3f00
|
@ -1 +1,2 @@
|
||||||
/main.tar.gz
|
/main.tar.gz
|
||||||
|
/v2.6.0b2.tar.gz
|
||||||
|
|
25
cantera.spec
25
cantera.spec
|
@ -1,5 +1,5 @@
|
||||||
%global fork Cantera
|
%global fork Cantera
|
||||||
%global branch main
|
%global vmod b2
|
||||||
|
|
||||||
Name: cantera
|
Name: cantera
|
||||||
Version: 2.6.0
|
Version: 2.6.0
|
||||||
|
@ -7,7 +7,7 @@ Release: %autorelease
|
||||||
Summary: Chemical kinetics, thermodynamics, and transport tool suite
|
Summary: Chemical kinetics, thermodynamics, and transport tool suite
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: https://github.com/%{fork}/%{name}/
|
URL: https://github.com/%{fork}/%{name}/
|
||||||
Source0: %{url}archive/%{branch}.tar.gz
|
Source0: %{url}archive/refs/tags/v%{version}%{vmod}.tar.gz
|
||||||
|
|
||||||
BuildRequires: boost-devel
|
BuildRequires: boost-devel
|
||||||
BuildRequires: eigen3-devel
|
BuildRequires: eigen3-devel
|
||||||
|
@ -21,9 +21,11 @@ BuildRequires: python3
|
||||||
BuildRequires: python3-Cython
|
BuildRequires: python3-Cython
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: python3-numpy
|
BuildRequires: python3-numpy
|
||||||
|
BuildRequires: python3-pip
|
||||||
BuildRequires: python3-pytest
|
BuildRequires: python3-pytest
|
||||||
BuildRequires: python3-ruamel-yaml
|
BuildRequires: python3-ruamel-yaml
|
||||||
BuildRequires: python3-scons
|
BuildRequires: python3-scons
|
||||||
|
BuildRequires: python3-wheel
|
||||||
BuildRequires: sundials-devel
|
BuildRequires: sundials-devel
|
||||||
BuildRequires: yaml-cpp-devel
|
BuildRequires: yaml-cpp-devel
|
||||||
|
|
||||||
|
@ -90,18 +92,28 @@ Summary: Static libraries for Cantera
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{branch}
|
%autosetup -n %{name}-%{version}%{vmod}
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%set_build_flags
|
%set_build_flags
|
||||||
|
|
||||||
%scons build prefix=%{_prefix} libdirname=%{_lib} system_sundials=y f90_interface=y renamed_shared_libraries=n python_package=full system_eigen=y extra_inc_dirs=/usr/include/eigen3 system_fmt=y
|
%scons build prefix=%{_prefix} python_prefix=%{_prefix} libdirname=%{_lib} system_sundials=y f90_interface=y renamed_shared_libraries=n python_package=full system_eigen=y extra_inc_dirs=/usr/include/eigen3 system_fmt=y
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%scons install prefix=%{_prefix} libdirname=%{_lib} stage_dir=%{buildroot}
|
%scons install prefix=%{_prefix} python_prefix=%{_prefix} libdirname=%{_lib} stage_dir=%{buildroot}
|
||||||
|
|
||||||
|
#kludges for https://github.com/Cantera/cantera/issues/1233
|
||||||
|
%if 0%{?fedora} >= 36
|
||||||
|
mv %{buildroot}%{_prefix}/local/bin/* %{buildroot}%{_bindir}/
|
||||||
|
rm -rf %{buildroot}%{_prefix}/local/bin
|
||||||
|
%endif
|
||||||
|
|
||||||
|
mkdir -p %{buildroot}%{python3_sitearch}/
|
||||||
|
mv %{buildroot}%{_prefix}/local/lib64/python%{python3_version}/site-packages/* %{buildroot}%{python3_sitearch}/
|
||||||
|
rm -rf %{buildroot}%{_prefix}/local/
|
||||||
|
#end_kludge
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%scons test
|
%scons test
|
||||||
|
@ -129,8 +141,9 @@ Summary: Static libraries for Cantera
|
||||||
%ghost %{_bindir}/setup_cantera
|
%ghost %{_bindir}/setup_cantera
|
||||||
%ghost %{_bindir}/setup_cantera.csh
|
%ghost %{_bindir}/setup_cantera.csh
|
||||||
|
|
||||||
|
|
||||||
%files -n python3-%{name}
|
%files -n python3-%{name}
|
||||||
%{python3_sitearch}/Cantera-%{version}a4-py%{python3_version}.egg-info/
|
%{python3_sitearch}/Cantera-%{version}%{vmod}.dist-info/
|
||||||
%{python3_sitearch}/%{name}/
|
%{python3_sitearch}/%{name}/
|
||||||
|
|
||||||
|
|
||||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
||||||
SHA512 (main.tar.gz) = a816754a2ad1b670a6f4e4927adac5c5b15b6b257b0c54436fe98afb3ace14e27a753067960365745b4fe005e91dbff8e3fdfbfcaac16568386e28a5cdd08bc1
|
SHA512 (v2.6.0b2.tar.gz) = 78c5e93728463116ceb675ff6244cccc31c577f8a865c5d50e00fc4d1021b1eeb61f89c5682739ed1f2a2906bcad8948111f36746623338f3308ae83faf791aa
|
||||||
|
|
Loading…
Reference in New Issue