remove kludges for F37+
This commit is contained in:
parent
c1eae3e054
commit
49a3959c75
29
cantera.spec
29
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
|
||||
|
||||
|
|
Loading…
Reference in New Issue