diff --git a/python-qt5.spec b/python-qt5.spec index 0e363ed..49044cd 100644 --- a/python-qt5.spec +++ b/python-qt5.spec @@ -17,7 +17,7 @@ Summary: PyQt5 is Python bindings for Qt5 Name: python-qt5 Version: 5.5.1 -Release: 10%{?dist} +Release: 11%{?dist} # all BSD, except for GPLv2+ dbus bindings and examples License: BSD and GPLv2+ @@ -165,18 +165,15 @@ Requires: python3-qt5%{?_isa} = %{version}-%{release} %setup -q -n PyQt-gpl-%{version}%{?snap:-snapshot-%{snap}} %patch0 -p1 -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif # with_python3 - %build PATH=%{_qt5_bindir}:$PATH ; export PATH # Python 2 build: %if 0%{?with_python2} -%{__python2} configure.py \ +mkdir %{_target_platform} +pushd %{_target_platform} +%{__python2} ../configure.py \ --assume-shared \ --confirm-license \ --no-timestamp \ @@ -186,11 +183,13 @@ PATH=%{_qt5_bindir}:$PATH ; export PATH CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" LFLAGS="%{?__global_ldflags}" make %{?_smp_mflags} +popd %endif # with_python2 # Python 3 build: %if 0%{?with_python3} -pushd %{py3dir} +mkdir %{_target_platform}-python3 +pushd %{_target_platform}-python3 %{__python3} configure.py \ --assume-shared \ --confirm-license \ @@ -209,7 +208,7 @@ popd # Python 3 build: %if 0%{?with_python3} -make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} -C %{py3dir} +make install DESTDIR=%{buildroot} 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 chmod a+rx $i @@ -218,7 +217,7 @@ done # Python 2 build: %if 0%{?with_python2} -make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} +make install DESTDIR=%{buildroot} 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 chmod a+rx $i @@ -388,6 +387,9 @@ sed -i \ %changelog +* Wed Mar 02 2016 Rex Dieter 5.5.1-11 +- use safer subdir builds + * Wed Mar 02 2016 Rex Dieter 5.5.1-10 - -webengine,-webkit subpkgs