From aa6af1e8604e006edbf617c5bced9d7521c188c6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Nov 11 2009 17:22:47 +0000 Subject: - pyqt4_version 4.6.1 (everywhere) - drop qt46 patch (not working yet) --- diff --git a/kdebindings.spec b/kdebindings.spec index 2d249c4..c18ff48 100644 --- a/kdebindings.spec +++ b/kdebindings.spec @@ -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}-%{release}-root-%(%{__id_u} -n) 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 in KDE4. %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 - 4.3.3-3 +- pyqt4_version 4.6.1 (everywhere) +- drop qt46 patch (not working yet) + * Fri Nov 06 2009 Kevin Kofler - 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 - 4.3.3-1 - 4.3.3