diff --git a/python-pbr.spec b/python-pbr.spec index faf986a..7988c06 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -1,6 +1,6 @@ Name: python-pbr Version: 5.11.1 -Release: 2mamba +Release: 3mamba Summary: A library that injects some useful and sensible default behaviors into your setuptools run Group: System/Libraries Vendor: openmamba @@ -40,13 +40,25 @@ CFLAGS="%{optflags}" %{__python} setup.py build sed -i "\,\.egg-info/,d;s,.*/man/.*,&.gz," %{name}.filelist +%if "%{?with_pyver}" != "3" +# Rename any conflicting file outside of python site packages tree +for f in %{_bindir}/pbr; do + mv %{buildroot}${f}{,-%{?pyappend}} +done +sed -i "\,%{_bindir}/pbr,d" %{name}.filelist +%endif + %files %{?pyappend} -f %{name}.filelist %defattr(-,root,root) +%{_bindir}/pbr* %dir %{python_sitearch}/pbr-%{version}-py*.egg-info %{python_sitearch}/pbr-%{version}-py*.egg-info/* %doc AUTHORS LICENSE %changelog +* Sat Sep 16 2023 Silvan Calarco 5.11.1-3mamba +- resolve bidir conflict + * Sun Sep 10 2023 Silvan Calarco 5.11.1-2mamba - fix missing -pyX suffix to built packages