diff --git a/.gitignore b/.gitignore index 3e60c1e..2a8a3c6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ /v2.6.0.tar.gz /cantera-test-ppc64le-aarch64-s390x.patch /cantera-py311-deprecated-U.patch +/v3.0.0.tar.gz +/add-python3_12.patch diff --git a/cantera.spec b/cantera.spec index e50aae2..8b0591c 100644 --- a/cantera.spec +++ b/cantera.spec @@ -1,24 +1,18 @@ +# RPATH issues are standard paths and result from upstream +%global __brp_check_rpaths %{nil} +%global debug_package %{nil} %global fork Cantera Name: cantera -Version: 2.6.0 +Version: 3.0.0 Release: %{?autorelease}%{!?autorelease:22{?dist}} Summary: Chemical kinetics, thermodynamics, and transport tool suite License: BSD URL: https://github.com/%{fork}/%{name}/ Source0: %{url}archive/refs/tags/v%{version}.tar.gz -# thermoToYaml test failures on ppc64le and aarch64 and s390x - BZ #2081451 -# increase test tolerance to pass -Patch0: cantera-test-ppc64le-aarch64-s390x.patch - -# Fails to build under Python 3.11 due to deprecated mode 'rU' - BZ #2094258 -# implement patch until upstream releases fix -Patch1: cantera-py311-deprecated-U.patch - -# Fix failure to build with pip >= 21.1 -# Fixed upstream: https://github.com/Cantera/cantera/pull/1272 -Patch2: fix-pip-build-21.1.patch +# Python 3.12 currently in pre-release and not officially supported +Patch0: add-python3_12.patch BuildRequires: boost-devel BuildRequires: eigen3-devel @@ -31,10 +25,14 @@ BuildRequires: gtest-devel BuildRequires: python3 BuildRequires: python3-Cython BuildRequires: python3-devel +BuildRequires: python3-h5py BuildRequires: python3-numpy +BuildRequires: python3-pandas +BuildRequires: python3-pint BuildRequires: python3-pip BuildRequires: python3-pytest BuildRequires: python3-ruamel-yaml +BuildRequires: python3-scipy BuildRequires: python3-scons BuildRequires: python3-wheel BuildRequires: sundials-devel @@ -101,17 +99,13 @@ Summary: Static libraries for Cantera %prep -%setup -n %{name}-%{version} -%patch0 -p0 -%patch1 -p1 -%patch2 -p1 +%autosetup -n %{name}-%{version} -p1 %build %set_build_flags %scons build \ - cxx_flags='-std=c++14' \ - extra_inc_dirs=/usr/include/eigen3 \ + extra_inc_dirs=%{_includedir}/eigen3 \ f90_interface=y \ libdirname=%{_lib} \ prefix=%{_prefix} \ @@ -143,14 +137,12 @@ Summary: Static libraries for Cantera %doc %{_mandir}/man1/ck2yaml.1.gz %doc %{_mandir}/man1/cti2yaml.1.gz %doc %{_mandir}/man1/ctml2yaml.1.gz -%doc %{_mandir}/man1/ck2cti.1.gz -%doc %{_mandir}/man1/ctml_writer.1.gz +%doc %{_mandir}/man1/yaml2ck.1.gz %{_bindir}/ck2yaml %{_bindir}/cti2yaml %{_bindir}/ctml2yaml -%{_bindir}/ctml_writer -%{_bindir}/ck2cti +%{_bindir}/yaml2ck %{_datadir}/%{name} @@ -168,11 +160,12 @@ Summary: Static libraries for Cantera %{_libdir}/pkgconfig/cantera.pc %{_libdir}/libcantera.so -%{_libdir}/libcantera.so.2 +%{_libdir}/libcantera.so.3 %{_libdir}/libcantera.so.%{version} %{_libdir}/libcantera_fortran.so -%{_libdir}/libcantera_fortran.so.2 +%{_libdir}/libcantera_fortran.so.3 %{_libdir}/libcantera_fortran.so.%{version} +%{_libdir}/libcantera_python*.so %files static diff --git a/sources b/sources index e70b9e7..4863a68 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (cantera-test-ppc64le-aarch64-s390x.patch) = 5eea9242cb94d95fda24e11ba90303c9f74171046412deb706f3679235bb55332d43e91b1282ca9ce9c572e8c32aba7e5b1794007ca49454e024d30f2d36c5b1 -SHA512 (v2.6.0.tar.gz) = 74e12c89af38236bcc064034f74edcc690895151a9e453e728d130b83f5f527e675750c68a3fe36eea3c6aec6969685aa8828ae740a2e27b5df72a8ccc4d2856 -SHA512 (cantera-py311-deprecated-U.patch) = d1ce1adf42203e4b59b4c0dec520bcbabafdf0fbda1af6e7843830feee5ef8a6be3f98eb5cc73435eb51328635311078c9197c1c81ce131307bcbd4bfa20e6f7 +SHA512 (v3.0.0.tar.gz) = dffd696628210ae5c7b08e394e9a97262cfa6aa07ac2e6faa48591ecfee5bb11e7c2b6928563007fd581a1fd9cae999f7c1414ab5d5a312a823e155573df7aca +SHA512 (add-python3_12.patch) = 6611e32b58891e12088910c9d77de113a062ecc9a3b24be1e42decf6ecb233374067c374f784a4b1da6e474ce1edfd0a56998967ffbf2d6c25316775cb1022e7