rpms/kdebindings/F-12 kdebindings.spec, 1.247, 1.248 kdebindings-4.3.3-qt46.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1890

Modified Files:
	kdebindings.spec 
Removed Files:
	kdebindings-4.3.3-qt46.patch 
Log Message:
* Wed Nov 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-3
- pyqt4_version 4.6.1 (everywhere)
- drop qt46 patch (not working yet)



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-12/kdebindings.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -p -r1.247 -r1.248
--- kdebindings.spec	11 Nov 2009 15:03:07 -0000	1.247
+++ kdebindings.spec	11 Nov 2009 17:24:05 -0000	1.248
@@ -30,12 +30,7 @@
 %endif
 
 %define pykde4_akonadi 1
-%if 0%{?fedora} > 12
-# some combination of qt-4.6 + PyQt4-4.6.1 is inducing build failures
 %define pyqt4_version 4.6.1
-%else
-%define pyqt4_version 4.5.2
-%endif
 
 %if 0%{?rhel}
 %define falcon 0
@@ -72,8 +67,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch0:  kdebindings-qyoto-examples.patch
 # workaround change to sip/phonon/backendcapabilities.sip which requires PyQt4 4.5
 Patch1:  kdebindings-4.2.85-old-PyQt4.patch
-# fix build with Qt 4.6
-Patch2:  kdebindings-4.3.3-qt46.patch
+# try to fix build with Qt 4.6
+#Patch2:  kdebindings-4.3.3-qt46.patch
 
 ## upstream patches
 
@@ -282,7 +277,9 @@ Falcon plugin for the Kross archtecture 
 %setup -q
 %patch0
 %patch1 -p0 -b .old-PyQt4
-%patch2 -p1 -b .qt46
+#if 0%{?fedora} > 12 
+#patch2 -p1 -b .qt46
+#endif
 
 # upstream patches
 
@@ -547,8 +544,12 @@ fi
 
 
 %changelog
+* Wed Nov 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-3
+- pyqt4_version 4.6.1 (everywhere)
+- drop qt46 patch (not working yet)
+
 * Fri Nov 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-2
-- fix build with Qt 4.6
+- try to fix build with Qt 4.6 (f13+)
 
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3


--- kdebindings-4.3.3-qt46.patch DELETED ---