[PyQt4] fix dbus/mainloop hacks (#957867)
Rex Dieter
rdieter at fedoraproject.org
Fri May 3 17:41:55 UTC 2013
commit 2527a3f0fab38a87428e2cbff32fc84e3cc7a96c
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Fri May 3 12:41:54 2013 -0500
fix dbus/mainloop hacks (#957867)
PyQt4.spec | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/PyQt4.spec b/PyQt4.spec
index 23b248c..f286566 100644
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@ -8,7 +8,7 @@
Summary: Python bindings for Qt4
Name: PyQt4
Version: 4.10.1
-Release: 3%{?dist}
+Release: 4%{?dist}
# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
License: GPLv3 or GPLv2 with exceptions
@@ -228,10 +228,10 @@ InstallPyQt4 %{python_sitearch}
chrpath --list %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so && \
chrpath --delete %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so ||:
-mkdir -p %{buildroot}%{python_sitearch}/dbus/mainloop/_dbus_qt
+mkdir -p %{buildroot}%{python_sitearch}/_dbus_qt
mv %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so\
- %{buildroot}%{python_sitearch}/dbus/mainloop/_dbus_qt/qt.so
-touch %{buildroot}%{python_sitearch}/dbus/mainloop/_dbus_qt/__init__.py
+ %{buildroot}%{python_sitearch}/_dbus_qt/qt.so
+touch %{buildroot}%{python_sitearch}/_dbus_qt/__init__.py
echo 'from _dbus_qt.qt import *' > %{buildroot}%{python_sitelib}/dbus/mainloop/qt.py
# HACK: fix multilb conflict, http://bugzilla.redhat.com/509415
@@ -282,7 +282,7 @@ diff -u ./sip/QtOpenGL/opengl_types.sip.orig \
%{python_sitearch}/PyQt4/QtXml.so
%{python_sitearch}/PyQt4/QtXmlPatterns.so
%{python_sitearch}/PyQt4/uic/
-%{python_sitearch}/dbus/mainloop/_dbus_qt/
+%{python_sitearch}/_dbus_qt/
%{python_sitelib}/dbus/mainloop/qt.py*
%{_qt4_plugindir}/designer/*
@@ -345,6 +345,9 @@ diff -u ./sip/QtOpenGL/opengl_types.sip.orig \
%changelog
+* Fri May 03 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.1-4
+- fix dbus/mainloop hacks (#957867)
+
* Thu May 02 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.1-3
- ImportError: cannot import name uic (#958736)
More information about the scm-commits
mailing list