This commit is contained in:
Rex Dieter 2019-10-01 09:37:21 -05:00
parent 0eb88b5580
commit b71810573b
4 changed files with 23 additions and 13 deletions

1
.gitignore vendored
View File

@ -14,3 +14,4 @@
/PyQt5_gpl-5.12.2.tar.gz /PyQt5_gpl-5.12.2.tar.gz
/PyQt5_gpl-5.12.3.tar.gz /PyQt5_gpl-5.12.3.tar.gz
/PyQt5_gpl-5.13.0.tar.gz /PyQt5_gpl-5.13.0.tar.gz
/PyQt5_gpl-5.13.1.tar.gz

View File

@ -1,12 +1,12 @@
diff -up PyQt5_gpl-5.11.2/sip/QtCore/QtCoremod.sip.Timeline PyQt5_gpl-5.11.2/sip/QtCore/QtCoremod.sip diff -up PyQt5_gpl-5.13.1/sip/QtCore/QtCoremod.sip.Timeline PyQt5_gpl-5.13.1/sip/QtCore/QtCoremod.sip
--- PyQt5_gpl-5.11.2/sip/QtCore/QtCoremod.sip.Timeline 2018-07-10 15:25:49.295960286 -0500 --- PyQt5_gpl-5.13.1/sip/QtCore/QtCoremod.sip.Timeline 2019-09-07 14:37:20.000000000 -0500
+++ PyQt5_gpl-5.11.2/sip/QtCore/QtCoremod.sip 2018-07-10 15:26:22.781340757 -0500 +++ PyQt5_gpl-5.13.1/sip/QtCore/QtCoremod.sip 2019-10-01 09:23:44.472524437 -0500
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
%Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True) %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True)
-%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2} -%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2 Qt_5_11_3 Qt_5_12_0 Qt_5_12_1 Qt_5_12_2 Qt_5_12_3 Qt_5_12_4 Qt_5_13_0}
+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2 Qt_5_11_3 Qt_5_12_0 Qt_5_12_1 Qt_5_12_2} +%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2 Qt_5_11_3 Qt_5_12_0 Qt_5_12_1 Qt_5_12_2 Qt_5_12_3 Qt_5_12_4 Qt_5_12_5 Qt_5_13_0 Qt_5_13_1}
%Platforms {WS_X11 WS_WIN WS_MACX} %Platforms {WS_X11 WS_WIN WS_MACX}

View File

@ -32,12 +32,18 @@
# see also https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JQQ66XJSIT2FGTK2YQY7AXMEH5IXMPUX/ # see also https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JQQ66XJSIT2FGTK2YQY7AXMEH5IXMPUX/
%undefine _strict_symbol_defs_build %undefine _strict_symbol_defs_build
# flatpak hacks go here
%if 0%{?flatpak}
%global python2_sip_incdir --sip-incdir %{_prefix}/include/python%{python2_version}
%global python3_sip_incdir --sip-incdir /usr/include/python%{python3_version}
%endif
#global snap dev1808131157 #global snap dev1808131157
Summary: PyQt5 is Python bindings for Qt5 Summary: PyQt5 is Python bindings for Qt5
Name: python-qt5 Name: python-qt5
Version: 5.13.0 Version: 5.13.1
Release: 3%{?dist} Release: 1%{?dist}
License: GPLv3 License: GPLv3
Url: http://www.riverbankcomputing.com/software/pyqt/ Url: http://www.riverbankcomputing.com/software/pyqt/
@ -53,7 +59,7 @@ Source4: pyuic5.sh
## upstreamable patches ## upstreamable patches
Patch0: python-qt5_sipdir.patch Patch0: python-qt5_sipdir.patch
# support newer Qt5 releases than 5.11.1 # support newer Qt5 releases
Patch1: PyQt5-Timeline.patch Patch1: PyQt5-Timeline.patch
BuildRequires: chrpath BuildRequires: chrpath
@ -90,7 +96,7 @@ BuildRequires: python2-enum34
%global python2_dbus dbus-python %global python2_dbus dbus-python
%endif %endif
BuildRequires: %{python2_dbus} BuildRequires: %{python2_dbus}
%global sip_ver 4.19.18 %global sip_ver 4.19.19
BuildRequires: python2-pyqt5-sip >= %{sip_ver} BuildRequires: python2-pyqt5-sip >= %{sip_ver}
BuildRequires: python2-sip-devel >= %{sip_ver} BuildRequires: python2-sip-devel >= %{sip_ver}
%endif # with_python2 %endif # with_python2
@ -261,7 +267,7 @@ Requires: python%{python3_pkgversion}-qt5%{?_isa} = %{version}-%{release}
%setup -q -n PyQt5_gpl-%{version}%{?snap:.%{snap}} %setup -q -n PyQt5_gpl-%{version}%{?snap:.%{snap}}
%patch0 -p1 %patch0 -p1
#patch1 -p1 %patch1 -p1
%build %build
@ -283,7 +289,7 @@ pushd %{_target_platform}
--qmake=%{_qt5_qmake} \ --qmake=%{_qt5_qmake} \
%{!?with_python3:--no-qsci-api}%{?with_python3:--qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci} \ %{!?with_python3:--no-qsci-api}%{?with_python3:--qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci} \
--verbose \ --verbose \
--sip-incdir %{_prefix}/include/python%{python2_version}/ \ %{?python2_sip_incdir} \
--dbus=/usr/include/dbus-1.0/ \ --dbus=/usr/include/dbus-1.0/ \
QMAKE_CFLAGS_RELEASE="%{optflags}" \ QMAKE_CFLAGS_RELEASE="%{optflags}" \
QMAKE_CXXFLAGS_RELEASE="%{optflags} -I/usr/%{_lib}/dbus-1.0/include/" \ QMAKE_CXXFLAGS_RELEASE="%{optflags} -I/usr/%{_lib}/dbus-1.0/include/" \
@ -306,7 +312,7 @@ pushd %{_target_platform}-python3
%{?py3_sip:--sip=%{_bindir}/python3-sip} \ %{?py3_sip:--sip=%{_bindir}/python3-sip} \
%{?py3_sipdir:--sipdir=%{py3_sipdir}} \ %{?py3_sipdir:--sipdir=%{py3_sipdir}} \
--verbose \ --verbose \
--sip-incdir /usr/include/python%{python3_version}/ \ %{?python3_sip_incdir} \
--dbus=/usr/include/dbus-1.0/ \ --dbus=/usr/include/dbus-1.0/ \
QMAKE_CFLAGS_RELEASE="%{optflags}" \ QMAKE_CFLAGS_RELEASE="%{optflags}" \
QMAKE_CXXFLAGS_RELEASE="%{optflags} -I/usr/%{_lib}/dbus-1.0/include/" \ QMAKE_CXXFLAGS_RELEASE="%{optflags} -I/usr/%{_lib}/dbus-1.0/include/" \
@ -550,6 +556,9 @@ sed -i \
%changelog %changelog
* Tue Oct 01 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.13.1-1
- 5.13.1
* Wed Sep 25 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.0-3 * Wed Sep 25 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.0-3
- rebuild (qt5) - rebuild (qt5)

View File

@ -1 +1 @@
SHA512 (PyQt5_gpl-5.13.0.tar.gz) = 72cdd700956f8a5791fd38cac6a348f189eec9e69f3fd79a0c711ff49c770d4982fe62ec9057830d26abc4c12133922df915be0844449212f0bdf338fe1e4cb0 SHA512 (PyQt5_gpl-5.13.1.tar.gz) = 7b7001b16a8c730d7ff2d340fa1dd118868b53519e8f75e8c2ce00b44e3637ac6a31b41a7456fc610df11ff3928b924cb54c0c3712f22ed4df5058fd8bc77281