From 45af74af6a24380936bfb8a6f8f7e9961dfae51f Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 17:52:31 +0100 Subject: [PATCH] PyQt5-py310: remove conflicting file PyQt5.api [release 5.15.9-3mamba;Fri Oct 06 2023] --- PyQt5.spec | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/PyQt5.spec b/PyQt5.spec index 2aede19..38bc688 100644 --- a/PyQt5.spec +++ b/PyQt5.spec @@ -3,7 +3,7 @@ %define majver %(echo %version | cut -d. -f1-2) Name: PyQt5 Version: 5.15.9 -Release: 1mamba +Release: 3mamba Summary: Python bindings for the Qt5 cross platform GUI toolkit Group: System/Libraries Vendor: openmamba @@ -32,14 +32,16 @@ BuildRequires: libdbus-devel BuildRequires: libgcc BuildRequires: libglvnd-devel BuildRequires: libpython3-devel +BuildRequires: libpython311-devel BuildRequires: libstdc++6-devel -BuildRequires: python3.7dist(pyqt5-sip) +BuildRequires: python3.11dist(pyqt5-sip) BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtconnectivity-devel BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt5-qtquick3d-devel BuildRequires: qt5-qttools-devel ## AUTOBUILDREQ-END +BuildRequires: libpython3-devel >= 3.11.5 BuildRequires: chrpath BuildRequires: libXcursor-devel BuildRequires: libdbus-devel @@ -106,7 +108,7 @@ This package contains the QtDesigner support components for PyQt5. %build #:<< _EOF -sip-build-py%{with_pyver} \ +sip-build-py%{?with_pyver:%with_pyver} \ --confirm-license \ --no-make \ --api-dir %{_datadir}/qt5/qsci/api/python @@ -123,6 +125,7 @@ find examples/ -type f -exec chmod 0644 {} ';' %if "0%{pyver}" != "03" rm -f %{buildroot}%{_qt5_plugindir}/PyQt5/libpyqt5qmlplugin.so +rm -f %{buildroot}%{_datadir}/qt5/qsci/api/python/PyQt5.api %endif for f in pylupdate5 pyrcc5 pyuic5; do @@ -132,7 +135,6 @@ for f in pylupdate5 pyrcc5 pyuic5; do %endif done - %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -141,15 +143,17 @@ done %{_bindir}/pylupdate5* %{_bindir}/pyrcc5* %{_bindir}/pyuic5* +#%if "%{pyver}" != "3" %{python_sitearch}/dbus/mainloop/pyqt5.abi3.so +#%endif %dir %{python_sitearch}/PyQt5-%{version}.dist-info %{python_sitearch}/PyQt5-%{version}.dist-info/* %dir %{python_sitearch}/PyQt5 %{python_sitearch}/PyQt5/* %exclude %{python_sitearch}/PyQt5/QtDesigner.abi3.so %dir %{_qt5_plugindir}/PyQt5 -%{_datadir}/qt5/qsci/api/python/PyQt5.api %if "%{pyver}" == "3" +%{_datadir}/qt5/qsci/api/python/PyQt5.api %{_qt5_plugindir}/PyQt5/libpyqt5qmlplugin.so %endif %doc LICENSE* @@ -160,6 +164,12 @@ done %{_qt5_plugindir}/designer/* %changelog +* Fri Oct 06 2023 Silvan Calarco 5.15.9-3mamba +- PyQt5-py310: remove conflicting file PyQt5.api + +* Sat Sep 23 2023 Automatic Build System 5.15.9-2mamba +- rebuilt with python3 = 3.11.5 + * Tue Feb 07 2023 Automatic Build System 5.15.9-1mamba - automatic version update by autodist