Accepting request 79987 from home:termim:branches:KDE:Qt

add python-sip-bin package to avoid conflicts between python2 and python3 versions

OBS-URL: https://build.opensuse.org/request/show/79987
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt/python-sip?expand=0&rev=61

python-sip.spec

@@ -43,9 +43,8 @@ for any C or C++ library.
 License:        GPL-2.0 or GPL-3.0 or SIP
 Group:          Development/Libraries/Python
 Summary:        SIP tool to create python bindings
-Provides:       python-sip:/usr/bin/sip
 Requires:       %name = %version
-Requires:       c++_compiler python-devel
+Requires:       c++_compiler python-devel python-sip-bin
 
 %description devel
 SIP is a tool that makes it very easy to create Python bindings for C
@@ -56,6 +55,21 @@ for any C or C++ library.
 This package contains all the developer tools you need to create your 
 own sip bindings.
 
+
+%package bin
+License:        GPL-2.0 or GPL-3.0 or SIP
+Group:          Development/Libraries/Python
+Summary:        SIP tool to create python bindings
+Provides:       python-sip:/usr/bin/sip
+
+%description bin
+SIP is a tool that makes it very easy to create Python bindings for C
+and C++ libraries. It was originally developed to create PyQt, the
+Python bindings for the Qt toolkit, but can be used to create bindings
+for any C or C++ library.
+
+This package contains the sip executable
+
 %prep
 %setup -q -n sip-%{rversion}
 %patch0
@@ -81,10 +95,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc README
 %{py_sitedir}/sip.so
 
+%files bin
+%defattr(-,root,root)
+/usr/bin/sip
+
 %files devel
 %defattr(-,root,root)
 %doc NEWS LICENSE doc
-/usr/bin/sip
 %{py_incdir}/sip.h
 %{py_sitedir}/sipconfig.py
 %{py_sitedir}/sipdistutils.py

python3-sip.spec

@@ -49,7 +49,7 @@ Group:          Development/Libraries/Python
 Summary:        SIP tool to create python bindings
 Provides:       python3-sip:/usr/bin/sip
 Requires:       %name = %version
-Requires:       c++_compiler python3-devel
+Requires:       c++_compiler python3-devel python-sip-bin
 
 %description devel
 SIP is a tool that makes it very easy to create Python bindings for C
@@ -76,6 +76,8 @@ make %{?jobs:-j %jobs}
 make DESTDIR=$RPM_BUILD_ROOT install
 mkdir -p $RPM_BUILD_ROOT/usr/share/sip
 sed -i 's/"doc" directory/"doc" directory of package %{name}-devel/' README
+# sip executable is provided by python-sip-bin to avoid conflicts
+rm $RPM_BUILD_ROOT/usr/bin/sip
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -88,7 +90,6 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root)
 %doc NEWS LICENSE doc
-/usr/bin/sip
 %{py3_incdir}/sip.h
 %{python3_sitearch}/sipconfig.py
 %{python3_sitearch}/sipdistutils.py