From 202ca8ffaefdf6fff8a28ee66ad4fe81fd9dd387 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 26 Nov 2017 06:45:00 -0600 Subject: [PATCH] dbus mainloop debugging --- python-qt5.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/python-qt5.spec b/python-qt5.spec index 66e628c..f44040f 100644 --- a/python-qt5.spec +++ b/python-qt5.spec @@ -1,10 +1,9 @@ - %if 0%{?fedora} || 0%{?rhel} > 7 %global with_python3 1 -%global python3_dbus_dir %(%{__python3} -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])" 2>/dev/null) +%global python3_dbus_dir %(%{__python3} -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])" 2>/dev/null || echo "%{python3_sitearch}/dbus/mainloop") %endif %global with_python2 1 -%global python2_dbus_dir %(%{__python2} -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])" 2>/dev/null) +%global python2_dbus_dir %(%{__python2} -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])" 2>/dev/null || echo "%{python2_sitearch}/dbus/mainloop") # enable/disable individual modules # drop power64, it's not supported yet (than) @@ -207,6 +206,10 @@ Requires: python3-qt5%{?_isa} = %{version}-%{release} %patch0 -p1 +# debugging +echo -n "python2 dbus.mainloop path: " +echo "$(python2 -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])")" + %build PATH=%{_qt5_bindir}:$PATH ; export PATH @@ -259,7 +262,7 @@ popd 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 +test -x $i || chmod a+rx $i done %endif # with_python3 @@ -268,7 +271,7 @@ done 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 +test -x $i || chmod a+rx $i done %endif # with_python2