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=d1c427438a2c2... https://src.fedoraproject.org/cgit/rpms/cantera.git/commit/?id=7b64c384efe33... https://src.fedoraproject.org/cgit/rpms/cantera.git/commit/?id=e0f3da5756ab5....
Change: +ExcludeArch: %{ix86} -ExcludeArch: s390x # YAML test failures - BZ #2044056 +ExcludeArch: s390x # YAML test failures - BZ #2044056
Thanks.
Full change: ============
commit d1c427438a2c2e76dd68f02e308ea4cd0000614f Author: Mark E. Fuller mark.e.fuller@gmx.de Date: Thu Jan 26 22:06:06 2023 +0200
drop x86
diff --git a/cantera.spec b/cantera.spec index ed7bb4b..bf18ff8 100644 --- a/cantera.spec +++ b/cantera.spec @@ -48,6 +48,8 @@ BuildRequires: gcc-gfortran
%global scons scons%{?rhel:-3}
+ExcludeArch: %{ix86} + %global common_description %{expand: \ Cantera is a suite of object-oriented software tools for solving problems involving chemical kinetics, thermodynamics, and/or transport processes.
commit 78b0adf2c5955cecae3a09e7eda1a08400c177e3 Author: Mark E. Fuller mark.e.fuller@gmx.de Date: Thu Jan 26 20:14:37 2023 +0200
bump c++ std to 14 from 11, close rhbz#2164818
diff --git a/cantera.spec b/cantera.spec index e971a26..ed7bb4b 100644 --- a/cantera.spec +++ b/cantera.spec @@ -107,7 +107,7 @@ Summary: Static libraries for Cantera %build %set_build_flags
-%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 +%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 cxx_flags='-std=c++14'
%install
commit 8706905b80cfe295bbb2866c0131bccb53a3152f Author: Fedora Release Engineering releng@fedoraproject.org Date: Wed Jan 18 23:30:06 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
commit 05695e5a83d3a34d809fa6287b27b6351d13cc74 Author: Mamoru TASAKA mtasaka@fedoraproject.org Date: Wed Nov 16 07:29:27 2022 +0900
Rebuild for new libyaml-cpp
commit 7b64c384efe338efdba20d45cae9cd952a29c8cf Author: Mamoru TASAKA mtasaka@fedoraproject.org Date: Wed Nov 16 07:28:48 2022 +0900
Enable s390x again (after merging F36 branch)
diff --git a/cantera.spec b/cantera.spec index 055d25c..e971a26 100644 --- a/cantera.spec +++ b/cantera.spec @@ -48,8 +48,6 @@ BuildRequires: gcc-gfortran
%global scons scons%{?rhel:-3}
-ExcludeArch: s390x # YAML test failures - BZ #2044056 - %global common_description %{expand: \ Cantera is a suite of object-oriented software tools for solving problems involving chemical kinetics, thermodynamics, and/or transport processes.
commit 314d368dced426395cc86226ba415ee019ffc005 Merge: 52271a3 49a3959 Author: Mark E. Fuller mark.e.fuller@gmx.de Date: Thu Oct 20 19:13:28 2022 +0300
merge to Python 3.11 (from F37 branch)
commit 52271a34a9dc49de9d0a8cfd5a9dd13ea627e0d1 Author: Mark E. Fuller mark.e.fuller@gmx.de Date: Tue Oct 18 22:56:26 2022 +0300
remove install kludges from F36
diff --git a/cantera.spec b/cantera.spec index 1cd5026..325cba0 100644 --- a/cantera.spec +++ b/cantera.spec @@ -105,33 +105,6 @@ Summary: Static libraries for Cantera %install %scons install prefix=%{_prefix} python_prefix=%{_prefix} libdirname=%{_lib} stage_dir=%{buildroot}
-###kludges for https://github.com/Cantera/cantera/issues/1233 - -# incorrect installation to /usr/local/bin on F36+ -%if 0%{?fedora} >= 36 -mv %{buildroot}%{_prefix}/local/bin/* %{buildroot}%{_bindir}/ -rm -rf %{buildroot}%{_prefix}/local/bin -%endif - -# incorrect installation to /usr/lib/ on 64 bit systems on F36- -%if 0%{?fedora} <= 36 -if [[ -d %{buildroot}%{_prefix}/lib/python%{python3_version}/site-packages ]] && [ %{_lib} == "lib64" ]; then - mkdir -p %{buildroot}%{python3_sitearch}/ - mv %{buildroot}%{_prefix}/lib/python%{python3_version}/site-packages/* %{buildroot}%{python3_sitearch}/ -fi -if [[ -d %{buildroot}%{_prefix}/local/lib/python%{python3_version}/site-packages ]] && [ %{_lib} == "lib64" ]; then - mkdir -p %{buildroot}%{python3_sitearch}/ - mv %{buildroot}%{_prefix}/local/lib/python%{python3_version}/site-packages/* %{buildroot}%{python3_sitearch}/ -fi -%endif - -# incorrect installation to /usr/local/lib* on F36+ -%if 0%{?fedora} >= 36 -mkdir -p %{buildroot}%{python3_sitearch}/ -mv %{buildroot}%{_prefix}/local/%{_lib}/python%{python3_version}/site-packages/* %{buildroot}%{python3_sitearch}/ -rm -rf %{buildroot}%{_prefix}/local/ -%endif -###end_kludge
%check %scons test
commit e0f3da5756ab5fdef915e09b6a7f0cab056dea3a Author: Mark E. Fuller mark.e.fuller@gmx.de Date: Fri May 27 10:55:12 2022 +0300
reapply s390x exclude (premature removal)
diff --git a/cantera.spec b/cantera.spec index f67f911..1cd5026 100644 --- a/cantera.spec +++ b/cantera.spec @@ -40,6 +40,7 @@ BuildRequires: gcc-gfortran
%global scons scons%{?rhel:-3}
+ExcludeArch: s390x # YAML test failures - BZ #2044056
%global common_description %{expand: \ Cantera is a suite of object-oriented software tools for solving problems
arch-excludes@lists.fedoraproject.org