[pykde4] introduce/use feature macros for qscintilla, webkit
Rex Dieter
rdieter at fedoraproject.org
Fri Mar 22 16:05:58 UTC 2013
commit 512f2d00b2ce17d871f708a376cad4690ddbb2d8
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Fri Mar 22 11:05:34 2013 -0500
introduce/use feature macros for qscintilla, webkit
pykde4.spec | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/pykde4.spec b/pykde4.spec
index 82bffd6..c7ec06c 100644
--- a/pykde4.spec
+++ b/pykde4.spec
@@ -2,13 +2,16 @@
%define pyqt4_version_min 4.9.5
%define sip_version_min 4.14
%if 0%{?fedora} > 17
-# needs kdelibs-4.9.2-6+
%define python3 1
%endif
+%if 0%{?fedora}
+%define qscintilla 1
+%define webkit 1
+%endif
Name: pykde4
Version: 4.10.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Python bindings for KDE4
# http://techbase.kde.org/Policies/Licensing_Policy
@@ -39,6 +42,9 @@ BuildRequires: pkgconfig(akonadi)
BuildRequires: pkgconfig(python)
BuildRequires: pkgconfig(qimageblitz)
BuildRequires: pkgconfig(soprano)
+%if 0%{?webkit}
+BuildRequires: pkgconfig(QtWebKit)
+%endif
BuildRequires: PyQt4-devel >= %{pyqt4_version_min}, sip-devel >= %{sip_version_min}
%if 0%{?python3}
BuildRequires: python3-devel
@@ -46,7 +52,7 @@ BuildRequires: python3-PyQt4-devel >= %{pyqt4_version_min}, python3-sip-devel >=
%global python3_abiflags %(%{__python3} -c "import sys ; print (\\"%s\\" % (getattr(sys,'abiflags','')))")
%global python3_pyqt4_version %(%{__python3} -c 'import PyQt4.pyqtconfig; print(PyQt4.pyqtconfig._pkg_config["pyqt_version_str"])' 2> /dev/null || echo %{pyqt4_version_min})
%endif
-%if 0%{?fedora}
+%if 0%{?qscintilla}
BuildRequires: qscintilla-devel >= 2.4
%endif
@@ -140,7 +146,7 @@ Provides: python3-PyKDE4-devel%{?_isa} = %{version}-%{release}
%patch200 -p1 -b .respect_sip_flags
%patch201 -p1 -b .kpythonpluginfactory_slots
-%if 0%{?rhel}
+%if ! 0%{?webkit}
%patch300 -p1 -b .webkit
%endif
@@ -248,6 +254,9 @@ mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/
%changelog
+* Fri Mar 22 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.1-3
+- introduce/use feature macros for qscintilla, webkit
+
* Mon Mar 04 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.1-2
- rebuild (sip/PyQt4)
More information about the scm-commits
mailing list