diff --git a/.gitignore b/.gitignore index 187331c..063d618 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /PyQt5_gpl-5.9.1.tar.gz /PyQt5_gpl-5.9.2.tar.gz /PyQt5_gpl-5.10.tar.gz +/PyQt5_gpl-5.10.1.tar.gz diff --git a/PyQt5-Timeline.patch b/PyQt5-Timeline.patch index 6c34b6e..7fff518 100644 --- a/PyQt5-Timeline.patch +++ b/PyQt5-Timeline.patch @@ -1,12 +1,12 @@ -diff -up PyQt5_gpl-5.10/sip/QtCore/QtCoremod.sip.timeline PyQt5_gpl-5.10/sip/QtCore/QtCoremod.sip ---- PyQt5_gpl-5.10/sip/QtCore/QtCoremod.sip.timeline 2018-01-23 04:20:38.000000000 -0600 -+++ PyQt5_gpl-5.10/sip/QtCore/QtCoremod.sip 2018-01-23 14:17:34.408329178 -0600 +diff -up PyQt5_gpl-5.10.1/sip/QtCore/QtCoremod.sip.Timeline PyQt5_gpl-5.10.1/sip/QtCore/QtCoremod.sip +--- PyQt5_gpl-5.10.1/sip/QtCore/QtCoremod.sip.Timeline 2018-02-27 04:43:52.000000000 -0600 ++++ PyQt5_gpl-5.10.1/sip/QtCore/QtCoremod.sip 2018-03-06 10:40:45.074557197 -0600 @@ -22,7 +22,7 @@ %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_10_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_10_0 Qt_5_10_1 Qt_5_10_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_99 Qt_5_10_0 Qt_5_10_1} ++%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_99 Qt_5_10_0 Qt_5_10_1 Qt_5_10_2} %Platforms {WS_X11 WS_WIN WS_MACX} diff --git a/python-qt5.spec b/python-qt5.spec index 567a072..cca9244 100644 --- a/python-qt5.spec +++ b/python-qt5.spec @@ -21,8 +21,8 @@ Summary: PyQt5 is Python bindings for Qt5 Name: python-qt5 -Version: 5.10 -Release: 4%{?dist} +Version: 5.10.1 +Release: 1%{?dist} License: GPLv3 Url: http://www.riverbankcomputing.com/software/pyqt/ @@ -237,7 +237,7 @@ pushd %{_target_platform} QMAKE_CXXFLAGS_RELEASE="%{optflags}" \ QMAKE_LFLAGS_RELEASE="%{?__global_ldflags}" -make %{?_smp_mflags} +%make_build popd %endif # with_python2 @@ -257,7 +257,7 @@ pushd %{_target_platform}-python3 QMAKE_CXXFLAGS_RELEASE="%{optflags}" \ QMAKE_LFLAGS_RELEASE="%{?__global_ldflags}" -make %{?_smp_mflags} +%make_build popd %endif # with_python3 @@ -266,7 +266,7 @@ popd # Python 3 build: %if 0%{?with_python3} -make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} -C %{_target_platform}-python3 +%make_install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-python3 # ensure .so modules are executable for proper -debuginfo extraction for i in %{buildroot}%{python3_sitearch}/PyQt5/*.so %{buildroot}%{python3_dbus_dir}/pyqt5.so ; do test -x $i || chmod a+rx $i @@ -275,7 +275,7 @@ done # Python 2 build: %if 0%{?with_python2} -make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} -C %{_target_platform} +%make_install INSTALL_ROOT=%{buildroot} -C %{_target_platform} # ensure .so modules are executable for proper -debuginfo extraction for i in %{buildroot}%{python2_sitearch}/PyQt5/*.so %{buildroot}%{python2_dbus_dir}/pyqt5.so ; do test -x $i || chmod a+rx $i @@ -466,6 +466,9 @@ sed -i \ %changelog +* Tue Mar 06 2018 Rex Dieter - 5.10.1-1 +- 5.10.1, use %%make_build + * Sat Mar 03 2018 Sérgio Basto - 5.10-4 - Enable python3 on epel7 diff --git a/sources b/sources index 809701c..2b5002e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyQt5_gpl-5.10.tar.gz) = a86520870536618857ed3ee1601af45f5a0b456de192a5d6a3f8fa734e5cf49b8ce373928c0f4aeaae365d3fa95db03b5f59ae2903bc5eb2304b7edf22198033 +SHA512 (PyQt5_gpl-5.10.1.tar.gz) = 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b