Accepting request 160643 from KDE:Distro:Factory

- Added fix-braindead-logic-in-PyQt-version-detection.diff, fixes
  build with PyQT >= 4.10
- Add provides/obsoletes for go-kate in libktexteditor, both packages
  ship the same syntax file

OBS-URL: https://build.opensuse.org/request/show/160643
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kate?expand=0&rev=30

fix-braindead-logic-in-PyQt-version-detection.diff

@@ -0,0 +1,34 @@
+From efea0f878622bec033943e50355015a18b7dcfec Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Fri, 15 Mar 2013 00:23:34 +0100
+Subject: [PATCH] Fix braindead logic in PyQt version detection. Fixes build
+ for PyQt >= 4.10.
+
+CCMAIL: srhaque@theiet.org
+---
+ kate/plugins/pate/sip/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/kate/plugins/pate/sip/CMakeLists.txt b/kate/plugins/pate/sip/CMakeLists.txt
+index d32266f..58b86e1 100644
+--- a/kate/plugins/pate/sip/CMakeLists.txt
++++ b/kate/plugins/pate/sip/CMakeLists.txt
+@@ -23,12 +23,12 @@ set(SIP_INCLUDES ${PYQT4_SIP_DIR} ${PYKDE4_SIP_DIR} ./kate)
+ set(SIP_CONCAT_PARTS 1)
+ set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
+ 
+-if(PYQT4_VERSION LESS "040905")  
++if(PYQT4_VERSION STRLESS "040905")
+     set(SIP_EXTRA_OPTIONS -g)
+-else (PYQT4_VERSION LESS "040905")
++else (PYQT4_VERSION STRLESS "040905")
+     # Disable QVector<int> for newer PyQt
+     set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector)
+-endif(PYQT4_VERSION LESS "040905")
++endif(PYQT4_VERSION STRLESS "040905")
+ 
+ add_sip_python_module(PyKate4.kate ./kate/katemod.sip ${KDE4_KTEXTEDITOR_LIBS} kateinterfaces)
+ 
+-- 
+1.8.2
+

kate.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Mar 21 08:27:22 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Added fix-braindead-logic-in-PyQt-version-detection.diff, fixes
+  build with PyQT >= 4.10
+- Add provides/obsoletes for go-kate in libktexteditor, both packages
+  ship the same syntax file
+
 -------------------------------------------------------------------
 Wed Mar 13 09:54:26 UTC 2013 - hrvoje.senjan@gmail.com
 

kate.spec

@@ -26,6 +26,8 @@ Url:            http://www.kde.org/
 Source0:        %{name}-%{version}.tar.xz
 #PATCH-FIX-UPSTREAM use-a-numeric-comparision.patch -- Fixes build with python-qt 4.10
 Patch0:         use-a-numeric-comparision.patch
+#PATCH-FIX-UPSTREAM Fix-braindead-logic-in-PyQt-version-detection.diff -- Also fixes build with python-qt 4.10
+Patch1:         fix-braindead-logic-in-PyQt-version-detection.diff
 BuildRequires:  fdupes
 BuildRequires:  libkactivities-devel
 BuildRequires:  libkde4-devel >= %version
@@ -47,6 +49,7 @@ Kate is an advanced text editor for KDE.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %ifarch ppc64
@@ -92,6 +95,10 @@ Files needed for development of Kate plugins.
 %package -n libktexteditor
 Summary:        Advanced Text Editor library
 Group:          Productivity/Editors/Other
+# With the sr#160617, go-kate package is no longer shipped, 
+# so adding specific version, if the package will return
+Provides:       go-kate = 1.0.3
+Obsoletes:      go-kate <= 1.0.3
 
 %description -n libktexteditor
 The libraries shared by kwrite and kate editors.