diff --git a/python-qt5.spec b/python-qt5.spec index 33a4de9..7b8a51f 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.8.2 -Release: 5%{?dist} +Version: 5.9 +Release: 1%{?dist} # all BSD, except for GPLv2+ dbus bindings and examples License: BSD and GPLv2+ @@ -214,8 +214,10 @@ PATH=%{_qt5_bindir}:$PATH ; export PATH # Python 2 build: %if 0%{?with_python2} mkdir %{_target_platform} +# copy sources, seems pure shadow build support broke with 5.9 -- rex +cp -a * %{_target_platform}/ ||: pushd %{_target_platform} -%{__python2} ../configure.py \ +%{__python2} ./configure.py \ --assume-shared \ --confirm-license \ --qmake=%{_qt5_qmake} \ @@ -232,12 +234,14 @@ popd # Python 3 build: %if 0%{?with_python3} mkdir %{_target_platform}-python3 +cp -a * %{_target_platform}-python3/ ||: pushd %{_target_platform}-python3 -%{__python3} ../configure.py \ +%{__python3} ./configure.py \ --assume-shared \ --confirm-license \ --qmake=%{_qt5_qmake} \ --no-qsci-api \ + --sip=%{_bindir}/python3-sip \ --verbose \ QMAKE_CFLAGS_RELEASE="%{optflags}" \ QMAKE_CXXFLAGS_RELEASE="%{optflags}" \ @@ -442,7 +446,7 @@ sed -i \ %endif # with_python3 %files doc -%doc doc/* +#doc doc/* %doc examples/ # avoid dep on qscintilla-python, own %%_qt5_datadir/qsci/... here for now %dir %{_qt5_datadir}/qsci/ @@ -452,6 +456,9 @@ sed -i \ %changelog +* Wed Jul 05 2017 Rex Dieter - 5.9-1 +- PyQt5-5.9 + * Wed Jul 05 2017 Rex Dieter - 5.8.2-5 - rebuild (sip) diff --git a/python-qt5_sipdir.patch b/python-qt5_sipdir.patch index 030b211..92eb2da 100644 --- a/python-qt5_sipdir.patch +++ b/python-qt5_sipdir.patch @@ -1,6 +1,6 @@ -diff -up PyQt5_gpl-5.8.2/configure.py.qt5_sipdir PyQt5_gpl-5.8.2/configure.py ---- PyQt5_gpl-5.8.2/configure.py.qt5_sipdir 2017-03-30 03:46:57.000000000 -0500 -+++ PyQt5_gpl-5.8.2/configure.py 2017-04-03 06:58:50.647698195 -0500 +diff -up PyQt5_gpl-5.9/configure.py.sipdir PyQt5_gpl-5.9/configure.py +--- PyQt5_gpl-5.9/configure.py.sipdir 2017-07-03 12:24:48.000000000 -0500 ++++ PyQt5_gpl-5.9/configure.py 2017-07-05 20:31:35.319524089 -0500 @@ -25,6 +25,7 @@ import os import shutil import stat @@ -17,4 +17,4 @@ diff -up PyQt5_gpl-5.8.2/configure.py.qt5_sipdir PyQt5_gpl-5.8.2/configure.py + self.pyqt_sip_dir = os.path.join(sipconfig.Configuration().default_sip_dir, 'PyQt5') self.pyuic_interpreter = py_config.pyuic_interpreter - # The qmake spec we want to use. + # Remaining values.