rpms/kdebindings/F-10 kdebindings.spec, 1.165, 1.166 kdebindings-4.2.4-fix-kpythonpluginfactory.patch, 1.1, NONE
Than Ngo
than at fedoraproject.org
Fri Sep 4 13:16:47 UTC 2009
Author: than
Update of /cvs/extras/rpms/kdebindings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10328
Modified Files:
kdebindings.spec
Removed Files:
kdebindings-4.2.4-fix-kpythonpluginfactory.patch
Log Message:
drop kdebindings-4.2.4-fix-kpythonpluginfactory.patch
Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-10/kdebindings.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- kdebindings.spec 1 Sep 2009 17:16:56 -0000 1.165
+++ kdebindings.spec 4 Sep 2009 13:16:47 -0000 1.166
@@ -8,11 +8,18 @@
%define csharp 1
%endif
%endif
+%if 0%{?fedora}
+# FIXME: Krossfalcon doesn't build in Rawhide (Falcon 0.9.x).
+# It's also not working properly. And there are no Falcon bindings for
+# the libraries anyway, just the Kross backend. -- Kevin
+%if 0%{?fedora} < 12
%define falcon 1
+%endif
%define php 1
%define ruby 1
%define smoke 1
%define java 0
+%endif
%define pykde4_akonadi 1
%define pyqt4_version 4.5.2
@@ -29,7 +36,7 @@
Name: kdebindings
Version: 4.3.1
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: KDE bindings to non-C++ languages
# http://techbase.kde.org/Policies/Licensing_Policy
@@ -43,8 +50,6 @@ 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
-# make the Python plugin factory work without python-devel
-Patch2: kdebindings-4.2.4-fix-kpythonpluginfactory.patch
## upstream patches
@@ -55,13 +60,13 @@ BuildRequires: kdebase-workspace-devel
BuildRequires: kdegraphics-devel >= %{version}
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
+%if 0%{?fedora} && 0%{?fedora} < 12
BuildRequires: polkit-qt-devel
+%endif
BuildRequires: python-devel
BuildRequires: PyQt4-devel >= %{pyqt4_version}
BuildRequires: qimageblitz-devel
-%if 0%{?fedora} > 8
BuildRequires: qscintilla-devel >= 2.4
-%endif
BuildRequires: qimageblitz-devel
BuildRequires: soprano-devel
%if 0%{?csharp}
@@ -250,9 +255,6 @@ Falcon plugin for the Kross archtecture
%setup -q
%patch0
%patch1 -p0 -b .old-PyQt4
-## Manually speciify PYTHON_LIBRARIES below in lieu of
-## a better, working, upstreamable patch
-#patch2 -p1 -b .fix-kpythonpluginfactory
# upstream patches
@@ -305,6 +307,12 @@ make -C %{_target_platform}
rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%if !0%{?fedora} || 0%{?fedora} >= 12
+# zap polkit-qt stuff which gets installed even without polkit-qt available
+rm -rf %{buildroot}%{_kde4_datadir}/sip/PyKDE4/polkitqt/
+rm -rf %{buildroot}%{_kde4_appsdir}/pykde4/examples/polkitqtExamples/
+%endif
+
# HACK: fix multilb conflict, similar to PyQt4's http://bugzilla.redhat.com/509415
rm -fv %{buildroot}%{_bindir}/pykdeuic4
mv %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py \
@@ -507,8 +515,18 @@ fi
%changelog
+* Thu Sep 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
+- also disable polkit-qt on EL6+
+- also remove polkit-qt sip files and examples on F12+/EL6+
+
+* Thu Sep 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-2
+- only (temporarily) disable Falcon on F12+
+- drop bindings for polkit-qt on F12+ (PolicyKit 0.9 is going away)
+- remove unused (commented out) patch
+
* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
- 4.3.1
+- temporarily disable Falcon bindings (build fails with Falcon 0.9.x)
* Mon Aug 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-5
- re-enable php bindings (rawhide)
--- kdebindings-4.2.4-fix-kpythonpluginfactory.patch DELETED ---
More information about the fedora-extras-commits
mailing list