From 49a3959c75d78427a039f79e6434b9a19ec30053 Mon Sep 17 00:00:00 2001 From: Mark E. Fuller Date: Sep 08 2022 17:47:40 +0000 Subject: remove kludges for F37+ --- diff --git a/cantera.spec b/cantera.spec index 2b1863b..04e090f 100644 --- a/cantera.spec +++ b/cantera.spec @@ -114,35 +114,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 -mkdir -p %{buildroot}%{_bindir}/ -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