diff --git a/.gitignore b/.gitignore index 3ea50a3..34f625b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /PyQt-gpl-5.5.1.tar.gz /PyQt5_gpl-5.6.tar.gz +/PyQt5_gpl-5.7.tar.gz diff --git a/PyQt5_gpl-5.6-dbus_ftbfs.patch b/PyQt5_gpl-5.6-dbus_ftbfs.patch deleted file mode 100644 index 6830dda..0000000 --- a/PyQt5_gpl-5.6-dbus_ftbfs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up PyQt5_gpl-5.6/configure.py.dbus PyQt5_gpl-5.6/configure.py ---- PyQt5_gpl-5.6/configure.py.dbus 2016-04-24 22:16:43.120281591 -0500 -+++ PyQt5_gpl-5.6/configure.py 2016-04-25 10:16:52.465218805 -0500 -@@ -2141,7 +2141,7 @@ def check_dbus(target_config, verbose): - else: - dlist = target_config.dbus_inc_dirs - -- target_config.dbus_inc_dirs = [] -+ #target_config.dbus_inc_dirs = [] - - for d in dlist: - if os.access(os.path.join(d, 'dbus', 'dbus-python.h'), os.F_OK): diff --git a/python-qt5.spec b/python-qt5.spec index bba26d6..e81f8a8 100644 --- a/python-qt5.spec +++ b/python-qt5.spec @@ -19,8 +19,8 @@ Summary: PyQt5 is Python bindings for Qt5 Name: python-qt5 -Version: 5.6 -Release: 8%{?dist} +Version: 5.7 +Release: 1%{?dist} # all BSD, except for GPLv2+ dbus bindings and examples License: BSD and GPLv2+ @@ -38,7 +38,6 @@ Source2: pyuic5.sh ## upstreamable patches Patch0: python-qt5_sipdir.patch -Patch1: PyQt5_gpl-5.6-dbus_ftbfs.patch BuildRequires: chrpath BuildRequires: findutils @@ -65,10 +64,10 @@ BuildRequires: pkgconfig(Qt5Xml) pkgconfig(Qt5XmlPatterns) BuildRequires: pkgconfig(Qt5WebChannel) BuildRequires: pkgconfig(Qt5WebSockets) BuildRequires: python2-devel python2 -BuildRequires: sip-devel >= 4.18 +BuildRequires: sip-devel >= 4.18.1 %if 0%{?with_python3} BuildRequires: python3-devel python3 -BuildRequires: python3-sip-devel >= 4.18 +BuildRequires: python3-sip-devel >= 4.18.1 BuildRequires: python3-dbus %endif # with_python3 @@ -188,7 +187,6 @@ Requires: python3-qt5%{?_isa} = %{version}-%{release} %setup -q -n PyQt5_gpl-%{version}%{?snap:-snapshot-%{snap}} %patch0 -p1 -%patch1 -p1 %build @@ -342,6 +340,10 @@ sed -i \ %{_bindir}/pyrcc5 %{_bindir}/pyuic5 %{_datadir}/sip/PyQt5/ +%{python2_sitearch}/PyQt5/pylupdate.so +%{python2_sitearch}/PyQt5/pylupdate_main.py +%{python2_sitearch}/PyQt5/pyrcc.so +%{python2_sitearch}/PyQt5/pyrcc_main.py %endif %if 0%{?with_python3} @@ -404,6 +406,10 @@ sed -i \ %{_bindir}/pyrcc5 %{_bindir}/pyuic5 %{_datadir}/python3-sip/PyQt5/ +%{python3_sitearch}/PyQt5/pylupdate.so +%{python3_sitearch}/PyQt5/pylupdate_main.py +%{python3_sitearch}/PyQt5/pyrcc.so +%{python3_sitearch}/PyQt5/pyrcc_main.py %endif # with_python3 %files doc @@ -417,6 +423,9 @@ sed -i \ %changelog +* Tue Jul 26 2016 Rex Dieter - 5.7-1 +- PyQt5-5.7 + * Tue Jul 19 2016 Fedora Release Engineering - 5.6-8 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages diff --git a/sources b/sources index 5d2bd02..0502bcf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dbfc885c0548e024ba5260c4f44e0481 PyQt5_gpl-5.6.tar.gz +e3dc21f31fd714659f0688e1eb31bacf PyQt5_gpl-5.7.tar.gz