From 05b012dde546d568dcf78ba051e5374b8314fa29 Mon Sep 17 00:00:00 2001 From: "Mark E. Fuller" Date: Tue, 21 Jun 2022 22:27:47 +0300 Subject: [PATCH] patched for python3.11 --- .gitignore | 1 + cantera.spec | 5 +++++ sources | 1 + 3 files changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 4f7bded..3e60c1e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /cantera-2.6.0b2.tar.gz /v2.6.0.tar.gz /cantera-test-ppc64le-aarch64-s390x.patch +/cantera-py311-deprecated-U.patch diff --git a/cantera.spec b/cantera.spec index f67f911..f0d9c71 100644 --- a/cantera.spec +++ b/cantera.spec @@ -12,6 +12,10 @@ Source0: %{url}archive/refs/tags/v%{version}.tar.gz # 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 + BuildRequires: boost-devel BuildRequires: eigen3-devel BuildRequires: fmt-devel @@ -108,6 +112,7 @@ Summary: Static libraries for Cantera # incorrect installation to /usr/local/bin on F36+ %if 0%{?fedora} >= 36 +mkdir -p %{buildroot}%{_bindir}/ mv %{buildroot}%{_prefix}/local/bin/* %{buildroot}%{_bindir}/ rm -rf %{buildroot}%{_prefix}/local/bin %endif diff --git a/sources b/sources index 53d50b7..e70b9e7 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (cantera-test-ppc64le-aarch64-s390x.patch) = 5eea9242cb94d95fda24e11ba90303c9f74171046412deb706f3679235bb55332d43e91b1282ca9ce9c572e8c32aba7e5b1794007ca49454e024d30f2d36c5b1 SHA512 (v2.6.0.tar.gz) = 74e12c89af38236bcc064034f74edcc690895151a9e453e728d130b83f5f527e675750c68a3fe36eea3c6aec6969685aa8828ae740a2e27b5df72a8ccc4d2856 +SHA512 (cantera-py311-deprecated-U.patch) = d1ce1adf42203e4b59b4c0dec520bcbabafdf0fbda1af6e7843830feee5ef8a6be3f98eb5cc73435eb51328635311078c9197c1c81ce131307bcbd4bfa20e6f7