[pykde4] FTBFS using sip-4.16

[Rex Dieter]

commit 6c613dae3af09af49f80ab2327c519e5925f92a9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 2 07:36:33 2014 -0500

    FTBFS using sip-4.16

 pykde4-4.13.1-sip416.patch |   14 ++++++++++++++
 pykde4.spec                |   13 +++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)
---
diff --git a/pykde4-4.13.1-sip416.patch b/pykde4-4.13.1-sip416.patch
new file mode 100644
index 0000000..fb8f9bb
--- /dev/null
+++ b/pykde4-4.13.1-sip416.patch
@@ -0,0 +1,14 @@
+diff -up pykde4-4.13.1/sip/plasma/glapplet.sip.sip416 pykde4-4.13.1/sip/plasma/glapplet.sip
+--- pykde4-4.13.1/sip/plasma/glapplet.sip.sip416	2014-03-10 01:36:53.000000000 -0500
++++ pykde4-4.13.1/sip/plasma/glapplet.sip	2014-06-02 06:54:31.898124821 -0500
+@@ -18,8 +18,8 @@
+ // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
+ //force
+-typedef unsigned int GLuint;
+-typedef unsigned int GLenum;
++//typedef unsigned int GLuint;
++//typedef unsigned int GLenum;
+ 
+ namespace Plasma
+ {
diff --git a/pykde4.spec b/pykde4.spec
index d838c1d..9454670 100644
--- a/pykde4.spec
+++ b/pykde4.spec
@@ -15,7 +15,7 @@
 
 Name:    pykde4 
 Version: 4.13.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Python bindings for KDE4 
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -41,6 +41,8 @@ Patch50: pykde4-4.12.3-python_library_realpath.patch
 %define sip_version_min 4.15.5
 %endif
 Patch51: pykde4-4.12.3-sip_4_15_5.patch
+# FTBFS against sip-4.16 (GLuint, GLenum already defined)
+Patch52: pykde4-4.13.1-sip416.patch
 
 ## upstream patches
 
@@ -71,7 +73,6 @@ BuildRequires: python2-devel
 BuildRequires: python3-devel
 BuildRequires: python3-PyQt4-devel >= %{pyqt4_version_min}, python3-sip-devel >= %{sip_version_min}
 %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%{?qscintilla}
 BuildRequires: qscintilla-devel >= 2.4
@@ -79,7 +80,7 @@ BuildRequires: qscintilla-devel >= 2.4
 
 Requires: kdelibs4%{?_isa} >= %{version}
 Requires: kate-part%{?_isa}
-%global pyqt4_version %(%{__python} -c 'import PyQt4.pyqtconfig; print(PyQt4.pyqtconfig._pkg_config["pyqt_version_str"])' 2> /dev/null || echo %{pyqt4_version_min})
+%global pyqt4_version %((%{__python} -c 'import PyQt4.pyqtconfig; print(PyQt4.pyqtconfig._pkg_config["pyqt_version_str"])' 2> /dev/null || echo %{pyqt4_version_min}) | cut -d- -f 1)
 Requires: PyQt4 >= %{pyqt4_version}
 %if 0%{?webkit}
 Requires: PyQt4-webkit
@@ -123,7 +124,7 @@ Obsoletes: python3-PyKDE4 < 4.7.97-1
 Provides:  python3-PyKDE4 =  %{version}-%{release}
 Provides:  python3-PyKDE4%{?_isa} = %{version}-%{release}
 %{?_sip_api:Requires: python3-sip-api(%{_sip_api_major}) >= %{_sip_api}}
-Requires: python3-PyQt4 >= %{python3_pyqt4_version}
+Requires: python3-PyQt4 >= %{pyqt4_version}
 %description -n python3-pykde4
 %{summary}.
 
@@ -158,6 +159,7 @@ Provides:  python3-PyKDE4-devel%{?_isa} = %{version}-%{release}
 %if "%{?sip_version_min}" == "4.15.5"
 %patch51 -p1 -b .sip_4_15_5
 %endif
+%patch52 -p1 -b .sip416
 
 %patch201 -p1 -b .201
 %patch202 -p1 -b .202
@@ -297,6 +299,9 @@ mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/
 
 
 %changelog
+* Mon Jun 02 2014 Rex Dieter <rdieter at fedoraproject.org> 4.13.1-4
+- FTBFS using sip-4.16
+
 * Wed May 28 2014 Rex Dieter <rdieter at fedoraproject.org> 4.13.1-3
 - rebuild (sip/PyQt4)