diff --git a/python-pybind11.spec b/python-pybind11.spec index f925295..d1e5f17 100644 --- a/python-pybind11.spec +++ b/python-pybind11.spec @@ -1,6 +1,6 @@ Name: python-pybind11 Version: 2.11.1 -Release: 1mamba +Release: 2mamba Summary: Seamless operability between C++11 and Python Group: System/Libraries Vendor: openmamba @@ -52,8 +52,17 @@ mv %{buildroot}%{python_sitearch}/pybind11/include %{buildroot}%{_prefix}/ install -d -m0755 %{buildroot}%{_datadir}/cmake mv %{buildroot}%{python_sitearch}/pybind11/share/cmake/pybind11 %{buildroot}%{_datadir}/cmake/ +%if "%{?with_pyver}" != "3" +# Rename any conflicting file outside of python site packages tree +for f in %{_bindir}/pybind11-config; do + mv %{buildroot}${f}{,-%{?pyappend}} +done +sed -i "\,%{_bindir}/pybind11-config,d" %{name}.filelist +%endif + %files %{?pyappend} -f %{name}.filelist %defattr(-,root,root) +%{_bindir}/pybind11-config* %dir %{python_sitearch}/pybind11-%{version}-py*.egg-info %{python_sitearch}/pybind11-%{version}-py*.egg-info/* %doc LICENSE @@ -72,6 +81,9 @@ mv %{buildroot}%{python_sitearch}/pybind11/share/cmake/pybind11 %{buildroot}%{_d %{_datadir}/cmake/pybind11/*.cmake %changelog +* Fri Aug 04 2023 Silvan Calarco 2.11.1-2mamba +- fix conflict for pybind11-config + * Tue Jul 18 2023 Automatic Build System 2.11.1-1mamba - automatic version update by autodist