diff --git a/cantera.spec b/cantera.spec index 8b0591c..726248d 100644 --- a/cantera.spec +++ b/cantera.spec @@ -1,14 +1,12 @@ # RPATH issues are standard paths and result from upstream %global __brp_check_rpaths %{nil} -%global debug_package %{nil} -%global fork Cantera Name: cantera Version: 3.0.0 -Release: %{?autorelease}%{!?autorelease:22{?dist}} +Release: %{?autorelease} Summary: Chemical kinetics, thermodynamics, and transport tool suite License: BSD -URL: https://github.com/%{fork}/%{name}/ +URL: https://github.com/Cantera/%{name}/ Source0: %{url}archive/refs/tags/v%{version}.tar.gz # Python 3.12 currently in pre-release and not officially supported @@ -20,26 +18,37 @@ BuildRequires: fmt-devel BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: git -BuildRequires: gmock-devel -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 BuildRequires: yaml-cpp-devel -%if 0%{?fedora} + +%if 0%{?suse_version} +BuildRequires: gmock +BuildRequires: gtest +BuildRequires: scons +BuildRequires: python3-Cython +BuildRequires: python3-numpy-devel +BuildRequires: python3-Pint +BuildRequires: python3-ruamel.yaml +%else +BuildRequires: gmock-devel +BuildRequires: gtest-devel +BuildRequires: python3-cython +BuildRequires: python3-pint +BuildRequires: python3-scons +BuildRequires: python3-ruamel-yaml +%endif + +%if 0%{?fedora} || 0%{?suse_version} BuildRequires: gcc-fortran +BuildRequires: python3-pandas %else BuildRequires: gcc-gfortran %endif diff --git a/fix-pip-build-21.1.patch b/fix-pip-build-21.1.patch deleted file mode 100644 index c1d66d2..0000000 --- a/fix-pip-build-21.1.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/interfaces/cython/SConscript b/interfaces/cython/SConscript -index 07d383a..8909146 100644 ---- a/interfaces/cython/SConscript -+++ b/interfaces/cython/SConscript -@@ -107,7 +107,7 @@ ext = localenv.LoadableModule(f"cantera/_cantera{module_ext}", - obj, LIBPREFIX="", SHLIBSUFFIX=module_ext, - SHLIBPREFIX="", LIBSUFFIXES=[module_ext]) - --build_cmd = ("$python_cmd_esc -m pip wheel -v --no-build-isolation --use-feature=in-tree-build --no-deps " -+build_cmd = ("$python_cmd_esc -m pip wheel -v --no-build-isolation --no-deps " - "--wheel-dir=build/python/dist build/python") - plat = info['plat'].replace('-', '_').replace('.', '_') - wheel_name = (f"Cantera-{env['cantera_version']}-cp{py_version_nodot}" -@@ -172,7 +172,7 @@ if env["stage_dir"]: - - install_cmd.append(f"--root={stage_dir.resolve()}") - --install_cmd.extend(("--no-build-isolation", "--use-feature=in-tree-build", "--no-deps", "-v", "--force-reinstall", -+install_cmd.extend(("--no-build-isolation", "--no-deps", "-v", "--force-reinstall", - "build/python")) - if localenv['PYTHON_INSTALLER'] == 'direct': - mod_inst = install(localenv.Command, 'dummy', mod,