[packages/sip] - rel 2; use PyQt5 module name

[Jakub Bogusz]

On Sat, Aug 11, 2018 at 05:00:44PM +0200, arekm wrote:
> commit c0d3d5beaaec64709c0c812a57e6e114cb28b3a1
> Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
> Date:   Sat Aug 11 17:00:37 2018 +0200
> 
>     - rel 2; use PyQt5 module name
> 
>  sip.spec | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
> ---
> diff --git a/sip.spec b/sip.spec
> index 752768f..e7435f1 100644
> --- a/sip.spec
> +++ b/sip.spec
[...]
> @@ -107,6 +107,7 @@ C++ przy użyciu SIP-a.
>  install -d build-py2
>  cd build-py2
>  %{__python} ../configure.py \
> +	--sip-module=PyQt5.sip \
>  	-b %{_bindir} \
>  	-e %{py_incdir} \
>  	-v %{_sipfilesdir} \
> @@ -126,6 +127,7 @@ cd ..
>  install -d build-py3
>  cd build-py3
>  %{__python3} ../configure.py \
> +	--sip-module=PyQt5.sip \
>  	-b %{_bindir} \
>  	-e %{py3_incdir} \
>  	-v %{_sipfilesdir} \
> @@ -173,7 +175,8 @@ rm -rf $RPM_BUILD_ROOT
>  %if %{with python2}
>  %files -n python-sip
>  %defattr(644,root,root,755)
> -%attr(755,root,root) %{py_sitedir}/sip.so
> +%dir %{py_sitedir}/PyQt5
> +%attr(755,root,root) %{py_sitedir}/PyQt5/sip.so
>  
>  %files -n python-sip-devel
>  %defattr(644,root,root,755)
> @@ -181,14 +184,15 @@ rm -rf $RPM_BUILD_ROOT
>  %{py_sitedir}/sipconfig.py[co]
>  %{py_sitedir}/sipdistutils.py
>  %{py_sitedir}/sipdistutils.py[co]
> -%{py_sitedir}/sip.pyi
> +%{py_sitedir}/PyQt5/sip.pyi
>  %{py_incdir}/sip.h
>  %endif
>  
>  %if %{with python3}
>  %files -n python3-sip
>  %defattr(644,root,root,755)
> -%attr(755,root,root) %{py3_sitedir}/sip.so
> +%dir %{py3_sitedir}/PyQt5
> +%attr(755,root,root) %{py3_sitedir}/PyQt5/sip.so
>  
>  %files -n python3-sip-devel
>  %defattr(644,root,root,755)
> @@ -196,6 +200,6 @@ rm -rf $RPM_BUILD_ROOT
>  %{py3_sitedir}/sipdistutils.py
>  %{py3_sitedir}/__pycache__/sipconfig.cpython-*.py[co]
>  %{py3_sitedir}/__pycache__/sipdistutils.cpython-*.py[co]
> -%{py3_sitedir}/sip.pyi
> +%{py3_sitedir}/PyQt5/sip.pyi
>  %{py3_incdir}/sip.h
>  %endif

Why?
It seems to just cause problems with PyQt5 module dir on Python 2.


Is it compatible with PyQt4?


-- 
Jakub Bogusz    http://qboosh.pl/