From a8a2b4ea8bffbd361a092729707d566607845664 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 6 Jan 2024 11:02:03 +0100
Subject: [PATCH] resolve bindir files conflicts [release 0.6.1-4mamba;Tue Aug
 01 2023]

---
 python-dbus-deviation.spec | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/python-dbus-deviation.spec b/python-dbus-deviation.spec
index 141b7c7..145a36e 100644
--- a/python-dbus-deviation.spec
+++ b/python-dbus-deviation.spec
@@ -1,7 +1,7 @@
 %define pkgname %(echo %name | cut -d- -f2- | tr - _)
 Name:          python-dbus-deviation
 Version:       0.6.1
-Release:       3mamba
+Release:       4mamba
 Summary:       A project for parsing D-Bus introspection XML and processing it in various ways
 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}/dbus-interface-{diff,vcs-helper}; do
+   mv %{buildroot}${f}{,-%{?pyappend}}
+done
+sed -i "\,%{_bindir}/dbus-interface,d" %{name}.filelist
+%endif
+
 %files %{?pyappend} -f %{name}.filelist
 %defattr(-,root,root)
+%{_bindir}/dbus-interface*
 %dir %{python_sitearch}/%{pkgname}-%{version}-py*.egg-info
 %{python_sitearch}/%{pkgname}-%{version}-py*.egg-info/*
 %doc AUTHORS COPYING
 
 %changelog
+* Tue Aug 01 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.1-4mamba
+- resolve bindir files conflicts
+
 * Mon Jul 31 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.1-3mamba
 - rebuilt with python 3.10