From a7f2bd9ef12bc40bd181e98ce2caac8cf928e379 Mon Sep 17 00:00:00 2001 From: Shuo Wang Date: Mon, 17 Jul 2023 15:43:00 +0800 Subject: [PATCH] update to 5.15.9 Signed-off-by: Shuo Wang --- pylupdate5.sh | 9 ---- pyrcc5.sh | 8 --- python-qt5.spec | 129 +++++++++++++++++++++++------------------------- pyuic5.sh | 8 --- sources | 2 +- 5 files changed, 62 insertions(+), 94 deletions(-) delete mode 100644 pylupdate5.sh delete mode 100644 pyrcc5.sh delete mode 100644 pyuic5.sh diff --git a/pylupdate5.sh b/pylupdate5.sh deleted file mode 100644 index 9a67bee..0000000 --- a/pylupdate5.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -@PYTHON3@ -Ic "import PyQt5.pylupdate_main" &> /dev/null -if [ $? -eq 0 ]; then - exec @PYTHON3@ -Im PyQt5.pylupdate_main ${1+"$@"} -else - exec @PYTHON2@ -c "import sys; del sys.path[0]; import PyQt5.pylupdate_main; PyQt5.pylupdate_main.main()" ${1+"$@"} - -fi diff --git a/pyrcc5.sh b/pyrcc5.sh deleted file mode 100644 index c7d5586..0000000 --- a/pyrcc5.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -@PYTHON3@ -Ic "import PyQt5.pyrcc_main" &> /dev/null -if [ $? -eq 0 ]; then - exec @PYTHON3@ -Im PyQt5.pyrcc_main ${1+"$@"} -else - exec @PYTHON2@ -c "import sys; del sys.path[0]; import PyQt5.pyrcc_main; PyQt5.pyrcc_main.main()" ${1+"$@"} -fi diff --git a/python-qt5.spec b/python-qt5.spec index dd65de0..ab25290 100644 --- a/python-qt5.spec +++ b/python-qt5.spec @@ -9,15 +9,12 @@ Summary: PyQt5 is a set of Python bindings for Qt5 Name: python-qt5 -Version: 5.15.6 -Release: 3%{?dist} +Version: 5.15.9 +Release: 1%{?dist} License: GPLv3 Url: http://www.riverbankcomputing.com/software/pyqt/ Source0: https://pypi.python.org/packages/source/P/PyQt5/PyQt5-%{version}.tar.gz Source1: macros.pyqt5 -Source2: pylupdate5.sh -Source3: pyrcc5.sh -Source4: pyuic5.sh BuildRequires: make chrpath findutils BuildRequires: pkgconfig(dbus-1) pkgconfig(dbus-python) qt5-qtbase-private-devel pkgconfig(Qt5Core) @@ -28,7 +25,7 @@ BuildRequires: pkgconfig(Qt5Quick) pkgconfig(Qt5QuickWidgets) pkgconfig(Qt5Senso BuildRequires: pkgconfig(Qt5Sql) pkgconfig(Qt5Svg) pkgconfig(Qt5Test) pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5Xml) pkgconfig(Qt5XmlPatterns) pkgconfig(Qt5WebChannel) pkgconfig(Qt5WebSockets) BuildRequires: python%{python3_pkgversion}-devel python%{python3_pkgversion} python%{python3_pkgversion}-dbus -BuildRequires: python%{python3_pkgversion}-pyqt5-sip python%{python3_pkgversion}-sip-devel +BuildRequires: %{py3_dist PyQt-builder} %{py3_dist sip} %if %{with enginio} BuildRequires: pkgconfig(Enginio) %endif @@ -98,62 +95,48 @@ Python v3 bindings for Qt5 Webkit. %autosetup -n PyQt5-%{version} -p1 %build -export PATH="%{_qt5_bindir}:$PATH" - -mkdir %{_target_platform}-python3 -cp -a * %{_target_platform}-python3/ ||: -pushd %{_target_platform}-python3 -%{__python3} ./configure.py \ - --assume-shared --confirm-license --no-dist-info --qmake=%{_qt5_qmake} \ - --qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci \ - %{?py3_sipdir:--sipdir=%{py3_sipdir}} --verbose QMAKE_CFLAGS_RELEASE="%{optflags}" \ - QMAKE_CXXFLAGS_RELEASE="%{optflags} `pkg-config --cflags dbus-python`"\ - QMAKE_LFLAGS_RELEASE="%{?__global_ldflags}" -%make_build -popd +PATH=%{_qt5_bindir}:$PATH ; export PATH + +sip-build \ + --no-make \ + --qt-shared \ + --confirm-license \ + --qmake=%{_qt5_qmake} \ + --api-dir=%{_qt5_datadir}/qsci/api/python \ + --verbose \ + --dbus=%{_includedir}/dbus-1.0/ \ + --pep484-pyi \ + --qmake-setting 'QMAKE_CFLAGS_RELEASE="%{optflags}"' \ + --qmake-setting 'QMAKE_CXXFLAGS_RELEASE="%{optflags} `pkg-config --cflags dbus-python`"' \ + --qmake-setting 'QMAKE_LFLAGS_RELEASE="%{?__global_ldflags}"' + +%make_build -C build %install -%make_install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-python3 -pushd %{buildroot} -%if "%py3_sipdir" == "%{_datadir}/sip/PyQt5" -mkdir -p .%{_datadir}/python3-sip -cp -alf .%{py3_sipdir} .%{_datadir}/python3-sip/PyQt5 -%endif -for i in .%{py3_site_qt5}/*.so .%{python3_dbus_dir}/pyqt5.so ; do - test -x $i || chmod a+rx $i -done +%make_install INSTALL_ROOT=%{buildroot} -C build +if [ "%{_prefix}" != "/usr" ]; then + cp -ru %{buildroot}/usr/* %{buildroot}%{_prefix}/ || echo "Nothing to copy" + rm -rf %{buildroot}/usr/* +fi + +%py_byte_compile %{__python3} %{buildroot}%{py3_site_qt5} -rm -rfv .%{py3_site_qt5}/uic/port_v2/ +find %{buildroot} -type f -name '*.so' | xargs chmod a+rx -install -p -m644 -D %{SOURCE1} .%{_rpmconfigdir}/macros.d/macros.pyqt5 +install -p -m644 -D %{SOURCE1} \ + %{buildroot}%{_rpmconfigdir}/macros.d/macros.pyqt5 sed -i \ -e "s|@@NAME@@|%{name}|g" \ -e "s|@@EPOCH@@|%{?epoch}%{!?epoch:0}|g" \ -e "s|@@VERSION@@|%{version}|g" \ -e "s|@@EVR@@|%{?epoch:%{epoch:}}%{version}-%{release}|g" \ - .%{_rpmconfigdir}/macros.d/macros.pyqt5 - -rm -fv .%{_bindir}/{pyrcc5,pylupdate5,pyuic5} -install -p -m755 -D %{SOURCE2} .%{_bindir}/pylupdate5 -install -p -m755 -D %{SOURCE3} .%{_bindir}/pyrcc5 -install -p -m755 -D %{SOURCE4} .%{_bindir}/pyuic5 -sed -i \ - -e "s|@PYTHON3@|%{__python3}|g" \ - .%{_bindir}/{pyrcc5,pylupdate5,pyuic5} -popd + %{buildroot}%{_rpmconfigdir}/macros.d/macros.pyqt5 %files rpm-macros -%defattr(-,root,root) %{_rpmconfigdir}/macros.d/macros.pyqt5 %files -n python%{python3_pkgversion}-qt5 -%defattr(-,root,root) -%{_bindir}/pylupdate5 -%{_bindir}/pyrcc5 -%{_bindir}/pyuic5 -%{_qt5_plugindir}/PyQt5 -%{_qt5_plugindir}/designer/libpyqt5.so -%if %{with enginio} +%if 0%{?enginio} %{py3_site_qt5}/Enginio.* %endif %{py3_site_qt5}/QtBluetooth.* @@ -174,19 +157,17 @@ popd %{py3_site_qt5}/QtWebSockets.* %{py3_site_qt5}/QtX11Extras.* %{py3_site_qt5}/QtXmlPatterns.* -%{py3_site_qt5}/uic/ -%{py3_site_qt5}/pylupdate.so -%{py3_site_qt5}/pylupdate_main.py* -%{py3_site_qt5}/pyrcc.so -%{py3_site_qt5}/pyrcc_main.py* %files -n python%{python3_pkgversion}-qt5-base %license LICENSE -%defattr(-,root,root) %doc NEWS README -%{python3_dbus_dir}/pyqt5.so +%{_bindir}/pylupdate5 +%{_bindir}/pyrcc5 +%{_bindir}/pyuic5 +%{python3_dbus_dir}/pyqt5.abi3.so %dir %{py3_site_qt5}/ -%{py3_site_qt5}/__pycache__/ +%{py3_site_qt5}-%{version}.dist-info +%{py3_site_qt5}/__pycache__/__init__.* %{py3_site_qt5}/__init__.py* %{py3_site_qt5}/Qt.* %{py3_site_qt5}/QtCore.* @@ -199,34 +180,46 @@ popd %{py3_site_qt5}/QtTest.* %{py3_site_qt5}/QtWidgets.* %{py3_site_qt5}/QtXml.* -%{py3_site_qt5}/_QOpenGLFunctions_* +%{py3_site_qt5}/_QOpenGLFunctions_2_0.* +%{py3_site_qt5}/_QOpenGLFunctions_2_1.* +%{py3_site_qt5}/_QOpenGLFunctions_4_1_Core.* +%{py3_site_qt5}/uic/ +%{py3_site_qt5}/pylupdate.abi3.so +%{py3_site_qt5}/pylupdate_main.py* +%{py3_site_qt5}/__pycache__/pylupdate_main* +%{py3_site_qt5}/pyrcc.abi3.so +%{py3_site_qt5}/pyrcc_main.py* +%{py3_site_qt5}/__pycache__/pyrcc_main* +%{py3_site_qt5}/py.typed +%{py3_site_qt5}/sip.pyi +%{_qt5_plugindir}/PyQt5/ +%{_qt5_plugindir}/designer/libpyqt5.so %if %{with webengine} %files -n python%{python3_pkgversion}-qt5-webengine -%defattr(-,root,root) -%{py3_site_qt5}/QtWebEngine* +%{py3_site_qt5}/QtWebEngine.* +%{py3_site_qt5}/QtWebEngineCore.* +%{py3_site_qt5}/QtWebEngineWidgets.* %endif %if %{with webkit} %files -n python%{python3_pkgversion}-qt5-webkit -%defattr(-,root,root) -%{py3_site_qt5}/QtWebKit* +%{py3_site_qt5}/QtWebKit.* +%{py3_site_qt5}/QtWebKitWidgets.* %endif %files -n python%{python3_pkgversion}-qt5-devel -%defattr(-,root,root) -%{py3_sipdir}/ -%dir %{_datadir}/python3-sip/ -%{_datadir}/python3-sip/PyQt5/ - -%defattr(-,root,root) %doc examples/ +%doc %{_qt5_datadir}/qsci/api/python/PyQt5.api +%{py3_site_qt5}/bindings/ %dir %{_qt5_datadir}/qsci/ %dir %{_qt5_datadir}/qsci/api/ %dir %{_qt5_datadir}/qsci/api/python/ -%doc %{_qt5_datadir}/qsci/api/python/PyQt5.api %changelog +* Mon Jul 17 2023 Shuo Wang - 5.15.9-1 +- update to 5.15.9 + * Fri Apr 28 2023 OpenCloudOS Release Engineering - 5.15.6-3 - Rebuilt for OpenCloudOS Stream 23.05 diff --git a/pyuic5.sh b/pyuic5.sh deleted file mode 100644 index 4d4869c..0000000 --- a/pyuic5.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -@PYTHON3@ -Ic "import PyQt5.uic.pyuic" &> /dev/null -if [ $? -eq 0 ]; then - exec @PYTHON3@ -Im PyQt5.uic.pyuic ${1+"$@"} -else - exec @PYTHON2@ -c "import sys; del sys.path[0]; import PyQt5.uic.pyuic; PyQt5.uic.pyuic.main()" ${1+"$@"} -fi diff --git a/sources b/sources index cd679de..bdfd7a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyQt5-5.15.6.tar.gz) = 65fd663cb70e8701e49bd4b39dc9384546cf2edd1b3bab259ca64b50908f48bdc02ca143f36cd6b429075f5616dcc7b291607dcb63afa176e828cded3b82f5c7 +SHA512 (PyQt5-5.15.9.tar.gz) = 1c07d93aefe1c24e80851eb4631b80a99e7ba06e823181325456edb90285d3d22417a9f7d4c3ff9c6195bd801e7dc2bbabf0587af844a5e4b0a410c4611d119e -- Gitee