From d165b72e5c090b8c0cbb91b78ae17481f934429d Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 16:32:17 +0100 Subject: [PATCH] py310: resolve bindir conflict [release 5.4.2-3mamba;Sun Apr 09 2023] --- python-qtconsole.spec | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/python-qtconsole.spec b/python-qtconsole.spec index 4d3551d..6e6e2ba 100644 --- a/python-qtconsole.spec +++ b/python-qtconsole.spec @@ -1,7 +1,7 @@ %define pkgname %(echo %name | cut -d- -f2- | tr - _) Name: python-qtconsole Version: 5.4.2 -Release: 1mamba +Release: 3mamba Summary: A rich Qt-based console for working with Jupyter kernels, supporting rich media output, session export, and more Group: System/Libraries Vendor: openmamba @@ -49,13 +49,29 @@ 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}/jupyter-qtconsole; do + mv %{buildroot}${f}{,-%{?pyappend}} +done +%endif + +sed -i "\,%{_bindir},d" %{name}.filelist + %files %{?pyappend} -f %{name}.filelist %defattr(-,root,root) +%{_bindir}/jupyter-qtconsole* %dir %{python_sitearch}/%{pkgname}-%{version}-py*.egg-info %{python_sitearch}/%{pkgname}-%{version}-py*.egg-info/* %doc LICENSE %changelog +* Sun Apr 09 2023 Silvan Calarco 5.4.2-3mamba +- py310: resolve bindir conflict + +* Fri Apr 07 2023 Sdk Build System 5.4.2-2mamba +- rebuilt with python 3.10 + * Mon Apr 03 2023 Automatic Build System 5.4.2-1mamba - automatic version update by autodist