The package rpms/cantera.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cantera.git/commit/?id=daa078f8c8...
https://src.fedoraproject.org/cgit/rpms/cantera.git/commit/?id=268fc9957a...
https://src.fedoraproject.org/cgit/rpms/cantera.git/commit/?id=f190aa615d....
Change:
-ExcludeArch: ppc64le # thermoToYaml test failures - BZ #2081451
+ExcludeArch: ppc64le # thermoToYaml test failures - BZ #2081451
+ExcludeArch: ppcle64 # thermoToYaml test failures - BZ #2081451
Thanks.
Full change:
============
commit 73938cd434125e584994f6f0f2f36de39fb47f63
Author: Mark E. Fuller <mark.e.fuller(a)gmx.de>
Date: Thu May 26 22:40:20 2022 +0300
fix premature spec changes
diff --git a/cantera.spec b/cantera.spec
index f981f4f..f67f911 100644
--- a/cantera.spec
+++ b/cantera.spec
@@ -143,10 +143,14 @@ rm -rf %{buildroot}%{_prefix}/local/
%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
%{_bindir}/ck2yaml
%{_bindir}/cti2yaml
%{_bindir}/ctml2yaml
+%{_bindir}/ctml_writer
+%{_bindir}/ck2cti
%{_datadir}/%{name}
@@ -157,6 +161,7 @@ rm -rf %{buildroot}%{_prefix}/local/
%files -n python3-%{name}
%{python3_sitearch}/%{name}/
+%{python3_sitearch}/Cantera-%{version}.dist-info/
%files devel
%{_includedir}/%{name}
commit daa078f8c862cda82ae9c45169fda98d46ce9113
Author: Mark E. Fuller <mark.e.fuller(a)gmx.de>
Date: Thu May 26 21:26:30 2022 +0300
patch cantera for test tolerances on alternate architectures
diff --git a/.gitignore b/.gitignore
index 157fc2f..4f7bded 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/v2.6.0b2.tar.gz
/cantera-2.6.0b2.tar.gz
/v2.6.0.tar.gz
+/cantera-test-ppc64le-aarch64-s390x.patch
diff --git a/cantera.spec b/cantera.spec
index 348a50c..f981f4f 100644
--- a/cantera.spec
+++ b/cantera.spec
@@ -2,12 +2,16 @@
Name: cantera
Version: 2.6.0
-Release: %autorelease
+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
+
BuildRequires: boost-devel
BuildRequires: eigen3-devel
BuildRequires: fmt-devel
@@ -37,11 +41,6 @@ BuildRequires: gcc-gfortran
%global scons scons%{?rhel:-3}
-ExcludeArch: s390x # YAML test failures - BZ #2044056
-ExcludeArch: aarch64 # thermoToYaml test failures - BZ #2081451
-ExcludeArch: ppc64le # thermoToYaml test failures - BZ #2081451
-
-
%global common_description %{expand: \
Cantera is a suite of object-oriented software tools for solving problems
involving chemical kinetics, thermodynamics, and/or transport processes.
@@ -93,8 +92,8 @@ Summary: Static libraries for Cantera
%prep
-%autosetup -n %{name}-%{version}
-
+%setup -n %{name}-%{version}
+%patch0 -p0
%build
%set_build_flags
@@ -141,17 +140,13 @@ rm -rf %{buildroot}%{_prefix}/local/
%license %{_datadir}/%{name}/doc/LICENSE.txt
%doc AUTHORS README.rst
-%doc %{_mandir}/man1/ck2cti.1.gz
%doc %{_mandir}/man1/ck2yaml.1.gz
%doc %{_mandir}/man1/cti2yaml.1.gz
%doc %{_mandir}/man1/ctml2yaml.1.gz
-%doc %{_mandir}/man1/ctml_writer.1.gz
-%{_bindir}/ck2cti
%{_bindir}/ck2yaml
%{_bindir}/cti2yaml
%{_bindir}/ctml2yaml
-%{_bindir}/ctml_writer
%{_datadir}/%{name}
@@ -161,7 +156,6 @@ rm -rf %{buildroot}%{_prefix}/local/
%files -n python3-%{name}
-%{python3_sitearch}/Cantera-%{version}.dist-info/
%{python3_sitearch}/%{name}/
%files devel
diff --git a/sources b/sources
index edb9b61..53d50b7 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+SHA512 (cantera-test-ppc64le-aarch64-s390x.patch) =
5eea9242cb94d95fda24e11ba90303c9f74171046412deb706f3679235bb55332d43e91b1282ca9ce9c572e8c32aba7e5b1794007ca49454e024d30f2d36c5b1
SHA512 (v2.6.0.tar.gz) =
74e12c89af38236bcc064034f74edcc690895151a9e453e728d130b83f5f527e675750c68a3fe36eea3c6aec6969685aa8828ae740a2e27b5df72a8ccc4d2856
commit 268fc9957a6843c88d656752be9195797480c778
Author: Mark E. Fuller <mark.e.fuller(a)gmx.de>
Date: Thu May 5 12:00:31 2022 +0300
fix typo in excludearch
diff --git a/cantera.spec b/cantera.spec
index fedab12..348a50c 100644
--- a/cantera.spec
+++ b/cantera.spec
@@ -39,7 +39,7 @@ BuildRequires: gcc-gfortran
ExcludeArch: s390x # YAML test failures - BZ #2044056
ExcludeArch: aarch64 # thermoToYaml test failures - BZ #2081451
-ExcludeArch: ppcle64 # thermoToYaml test failures - BZ #2081451
+ExcludeArch: ppc64le # thermoToYaml test failures - BZ #2081451
%global common_description %{expand: \
commit f190aa615d1d5c2f86a1b686c3fb575f0e6b2122
Author: Mark E. Fuller <mark.e.fuller(a)gmx.de>
Date: Tue May 3 22:20:25 2022 +0300
exclude aarch64, ppcle64 due to failing test (rtol)
diff --git a/cantera.spec b/cantera.spec
index c03de0b..fedab12 100644
--- a/cantera.spec
+++ b/cantera.spec
@@ -1,5 +1,4 @@
%global fork Cantera
-%global vmod b2
Name: cantera
Version: 2.6.0
@@ -7,7 +6,7 @@ Release: %autorelease
Summary: Chemical kinetics, thermodynamics, and transport tool suite
License: BSD
URL:
https://github.com/%{fork}/%{name}/
-Source0: %{url}archive/refs/tags/v%{version}%{vmod}.tar.gz
+Source0: %{url}archive/refs/tags/v%{version}.tar.gz
BuildRequires: boost-devel
BuildRequires: eigen3-devel
@@ -38,7 +37,9 @@ BuildRequires: gcc-gfortran
%global scons scons%{?rhel:-3}
-ExcludeArch: s390x # YAML test failures - BZ #2044056
+ExcludeArch: s390x # YAML test failures - BZ #2044056
+ExcludeArch: aarch64 # thermoToYaml test failures - BZ #2081451
+ExcludeArch: ppcle64 # thermoToYaml test failures - BZ #2081451
%global common_description %{expand: \
@@ -92,7 +93,7 @@ Summary: Static libraries for Cantera
%prep
-%autosetup -n %{name}-%{version}%{vmod}
+%autosetup -n %{name}-%{version}
%build
@@ -160,7 +161,7 @@ rm -rf %{buildroot}%{_prefix}/local/
%files -n python3-%{name}
-%{python3_sitearch}/Cantera-%{version}%{vmod}.dist-info/
+%{python3_sitearch}/Cantera-%{version}.dist-info/
%{python3_sitearch}/%{name}/
%files devel
commit 4b2b820b8b4bdf807500965049861056c3256166
Author: Mark E. Fuller <mark.e.fuller(a)gmx.de>
Date: Tue May 3 21:59:25 2022 +0300
official v2.6.0 release
diff --git a/.gitignore b/.gitignore
index 36b114b..157fc2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/main.tar.gz
/v2.6.0b2.tar.gz
/cantera-2.6.0b2.tar.gz
+/v2.6.0.tar.gz
diff --git a/sources b/sources
index 405658f..edb9b61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.6.0b2.tar.gz) =
78c5e93728463116ceb675ff6244cccc31c577f8a865c5d50e00fc4d1021b1eeb61f89c5682739ed1f2a2906bcad8948111f36746623338f3308ae83faf791aa
+SHA512 (v2.6.0.tar.gz) =
74e12c89af38236bcc064034f74edcc690895151a9e453e728d130b83f5f527e675750c68a3fe36eea3c6aec6969685aa8828ae740a2e27b5df72a8ccc4d2856