rpms/kdebindings/F-10 kdebindings.spec,1.169,1.170
Rex Dieter
rdieter at fedoraproject.org
Wed Nov 11 17:27:04 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kdebindings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3692
Modified Files:
kdebindings.spec
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-10/kdebindings.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- kdebindings.spec 9 Nov 2009 13:27:54 -0000 1.169
+++ kdebindings.spec 11 Nov 2009 17:27:03 -0000 1.170
@@ -30,11 +30,7 @@
%endif
%define pykde4_akonadi 1
-%if 0%{?fedora} > 11
%define pyqt4_version 4.6.1
-%else
-%define pyqt4_version 4.5.2
-%endif
%if 0%{?rhel}
%define falcon 0
@@ -57,7 +53,7 @@
Name: kdebindings
Version: 4.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: KDE bindings to non-C++ languages
# http://techbase.kde.org/Policies/Licensing_Policy
@@ -71,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
@@ -281,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
@@ -546,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
More information about the fedora-extras-commits
mailing list