rpms/kdebindings/devel kdebindings-4.2.85-old-PyQt4.patch, NONE, 1.1 kdebindings.spec, 1.198, 1.199

Kevin Kofler kkofler at fedoraproject.org
Wed May 20 05:40:11 UTC 2009


Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10815/devel

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.2.85-old-PyQt4.patch 
Log Message:
- revert change which requires PyQt4 4.5 (Kevin Kofler)

kdebindings-4.2.85-old-PyQt4.patch:

--- NEW FILE kdebindings-4.2.85-old-PyQt4.patch ---
--- python/pykde4/sip/phonon/backendcapabilities.sip	2009/04/25 13:15:30	959021
+++ python/pykde4/sip/phonon/backendcapabilities.sip	2009/04/25 13:15:26	959020
@@ -26,7 +26,7 @@
 {
 namespace BackendCapabilities
 {
-class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/
+class Notifier : QObject /NoDefaultCtors,NoQMetaObject/
 {
 
 signals:


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- kdebindings.spec	20 May 2009 03:04:20 -0000	1.198
+++ kdebindings.spec	20 May 2009 05:39:41 -0000	1.199
@@ -40,6 +40,8 @@ Source1: http://websvn.kde.org/*checkout
 
 # patch to disable examples (trouble with them installing to the buildroot)
 Patch0:  kdebindings-qyoto-examples.patch
+# revert change to sip/phonon/backendcapabilities.sip which requires PyQt4 4.5
+Patch1:  kdebindings-4.2.85-old-PyQt4.patch
 # upstream patches
 Patch100: kdebindings-4.2.85-t965579-remove-akonadi-private-API.patch
 Patch101: kdebindings-4.2.85-t965859-remove-KSystemTimeZones_Simulated.patch
@@ -248,6 +250,7 @@ Falcon plugin for the Kross archtecture 
 %prep
 %setup -q
 %patch0
+%patch1 -p0 -b .old-PyQt4
 %patch100 -p0
 %patch101 -p0
 %patch102 -p0
@@ -494,6 +497,7 @@ rm -rf %{buildroot}
 * Wed May 20 2009 Than Ngo <than at redhat.com> - 4.2.85-1
 - 4.2.85 (4.3 beta1)
 - build fixes backported from trunk by Nicolas Lécureuil <neoclust at mandriva.org>
+- revert change which requires PyQt4 4.5 (Kevin Kofler)
 
 * Tue Apr 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
 - F11+: enable csharp on ppc64




More information about the scm-commits mailing list