Hello community, here is the log from the commit of package python-qt4 for openSUSE:Factory checked in at Tue Oct 5 23:38:52 CEST 2010. -------- --- python-qt4/python-qt4.changes 2010-10-01 16:59:31.000000000 +0200 +++ python-qt4/python-qt4.changes 2010-10-05 10:57:52.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Oct 5 08:56:43 UTC 2010 - wstephenson@novell.com + +- Add patch to fix python-kde4 build from kde-packagers@kde.org + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- fix-scpk-and-flag-issue.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qt4.spec ++++++ --- /var/tmp/diff_new_pack.Tv5FTV/_old 2010-10-05 23:38:27.000000000 +0200 +++ /var/tmp/diff_new_pack.Tv5FTV/_new 2010-10-05 23:38:27.000000000 +0200 @@ -34,7 +34,7 @@ Group: Development/Libraries/Python Summary: PyQt - python bindings for Qt 4 Version: 4.7.7 -Release: 1 +Release: 2 %define rversion %version Url: http://www.riverbankcomputing.com/software/pyqt/intro BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,6 +42,7 @@ Patch0: link-python.diff Patch2: disable-rpaths.diff Patch3: build-compare.diff +Patch4: fix-scpk-and-flag-issue.diff %py_requires %if %suse_version <= 1110 %define python_sitelib %{py_sitedir} @@ -92,6 +93,7 @@ %patch0 -p1 %patch2 %patch3 +%patch4 -p1 %build export CXXFLAGS="$RPM_OPT_FLAGS" ++++++ build-compare.diff ++++++ --- /var/tmp/diff_new_pack.Tv5FTV/_old 2010-10-05 23:38:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Tv5FTV/_new 2010-10-05 23:38:28.000000000 +0200 @@ -1,6 +1,8 @@ ---- pyuic/uic/__init__.py +Index: pyuic/uic/__init__.py +=================================================================== +--- pyuic/uic/__init__.py.orig +++ pyuic/uic/__init__.py -@@ -7,8 +7,7 @@ +@@ -7,8 +7,7 @@ _header = """# -*- coding: utf-8 -*- # Form implementation generated from reading ui file '%s' # @@ -10,7 +12,7 @@ # # WARNING! All changes made in this file will be lost! -@@ -125,7 +124,7 @@ +@@ -125,7 +124,7 @@ def compileUi(uifile, pyfile, execute=Fa indenter.indentwidth = indent ++++++ fix-scpk-and-flag-issue.diff ++++++ Index: PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py =================================================================== --- PyQt-x11-gpl-4.7.7.orig/pyuic/uic/Loader/loader.py +++ PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py @@ -1,3 +1,5 @@ +import os.path + from PyQt4 import QtGui, QtCore from PyQt4.uic.uiparser import UIParser from PyQt4.uic.Loader.qobjectcreator import LoaderCreatorPolicy @@ -19,6 +21,7 @@ class DynamicUILoader(UIParser): def loadUi(self, filename, toplevelInst=None): self.toplevelInst = toplevelInst - # By using QFileInfo.path() rather than os.path.dirname() we allow - # QString file names. - return self.parse(filename, QtCore.QFileInfo(filename).path()) + # Allow the filename to be a QString. + filename = str(filename) + + return self.parse(filename, os.path.dirname(filename)) Index: PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip =================================================================== --- PyQt-x11-gpl-4.7.7.orig/sip/QtCore/qglobal.sip +++ PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip @@ -312,12 +312,12 @@ public: // Qt.Alignment class. QFlags operator|(int f); %MethodCode - sipRes = new QFlags(*a0 | (ENUM(a1))); + sipRes = new QFlags(*a0 | a1); %End QFlags operator^(int f); %MethodCode - sipRes = new QFlags(*a0 ^ (ENUM(a1))); + sipRes = new QFlags(*a0 ^ a1); %End // These are necessary to prevent Python comparing object IDs. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org