packages: python-PyQt4/python-PyQt4.spec, python-PyQt4/python-PyQt4-sip.pat...

[arekm]

Author: arekm                        Date: Sun Oct  3 09:28:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; kde related sip fix

---- Files affected:
packages/python-PyQt4:
   python-PyQt4.spec (1.56 -> 1.57) , python-PyQt4-sip.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/python-PyQt4/python-PyQt4.spec
diff -u packages/python-PyQt4/python-PyQt4.spec:1.56 packages/python-PyQt4/python-PyQt4.spec:1.57
--- packages/python-PyQt4/python-PyQt4.spec:1.56	Wed Sep 22 09:18:17 2010
+++ packages/python-PyQt4/python-PyQt4.spec	Sun Oct  3 11:28:29 2010
@@ -10,13 +10,14 @@
 Summary(pl.UTF-8):	Dowiązania do toolkitu Qt4 dla Pythona
 Name:		python-%{module}
 Version:	4.7.7
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Libraries/Python
 Source0:	http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}.tar.gz
 # Source0-md5:	b7b30ab25ee976407b37052f2f724bce
 Patch0:		%{name}-dbuspath.patch
 Patch1:		%{name}-64bit.patch
+Patch2:		%{name}-sip.patch
 URL:		http://www.riverbankcomputing.com/software/pyqt/
 BuildRequires:	QtDesigner-devel
 BuildRequires:	QtGui-devel
@@ -110,6 +111,7 @@
 %{__sed} -i 's/resp = sys.stdin.readline.*/resp = "yes"/' configure.py
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 python configure.py \
@@ -181,6 +183,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2010/10/03 09:28:29  arekm
+- rel 2; kde related sip fix
+
 Revision 1.56  2010/09/22 07:18:17  arekm
 - up to 4.7.7
 

================================================================
Index: packages/python-PyQt4/python-PyQt4-sip.patch
diff -u /dev/null packages/python-PyQt4/python-PyQt4-sip.patch:1.1
--- /dev/null	Sun Oct  3 11:28:34 2010
+++ packages/python-PyQt4/python-PyQt4-sip.patch	Sun Oct  3 11:28:29 2010
@@ -0,0 +1,17 @@
+--- PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip.org	2010-10-03 11:23:40.811024429 +0200
++++ PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip	2010-10-03 11:23:46.104789071 +0200
+@@ -312,12 +312,12 @@
+     // 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.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-PyQt4/python-PyQt4.spec?r1=1.56&r2=1.57&f=u