From 4df568a4d2f700949fc659ffd870fc470994c2e4af9872a1a2404f59a81b81b4 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Thu, 18 Apr 2013 08:15:53 +0000
Subject: [PATCH] Accepting request 163239 from KDE:Distro:Factory
Automatic submission by obs-autosubmit
OBS-URL: https://build.opensuse.org/request/show/163239
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kate?expand=0&rev=31
---
...ndead-logic-in-PyQt-version-detection.diff | 34 -----------------
kate-4.10.1.tar.xz | 3 --
kate-4.10.2.tar.xz | 3 ++
kate.changes | 8 ++++
kate.spec | 8 +---
use-a-numeric-comparision.patch | 37 -------------------
6 files changed, 12 insertions(+), 81 deletions(-)
delete mode 100644 fix-braindead-logic-in-PyQt-version-detection.diff
delete mode 100644 kate-4.10.1.tar.xz
create mode 100644 kate-4.10.2.tar.xz
delete mode 100644 use-a-numeric-comparision.patch
diff --git a/fix-braindead-logic-in-PyQt-version-detection.diff b/fix-braindead-logic-in-PyQt-version-detection.diff
deleted file mode 100644
index f182762..0000000
--- a/fix-braindead-logic-in-PyQt-version-detection.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-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
-
diff --git a/kate-4.10.1.tar.xz b/kate-4.10.1.tar.xz
deleted file mode 100644
index 169edff..0000000
--- a/kate-4.10.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7c273046998ac5dcc776345411091b20ef0b002c04e0f8ae37f8b5f0d99aa4f
-size 2555700
diff --git a/kate-4.10.2.tar.xz b/kate-4.10.2.tar.xz
new file mode 100644
index 0000000..aaa43bb
--- /dev/null
+++ b/kate-4.10.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e32274fd3a1e824aea6e29532e16bf892dfbe8a8084b06e20fd17d20cbbbcd31
+size 2566336
diff --git a/kate.changes b/kate.changes
index d833573..6b87028 100644
--- a/kate.changes
+++ b/kate.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Apr 1 19:11:47 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.10.2
+ * Bugfixes
+- Drop fix-braindead-logic-in-PyQt-version-detection.diff and
+ use-a-numeric-comparision.patch, they are included upstream
+
-------------------------------------------------------------------
Thu Mar 21 08:27:22 UTC 2013 - hrvoje.senjan@gmail.com
diff --git a/kate.spec b/kate.spec
index cfdd1eb..23b49e3 100644
--- a/kate.spec
+++ b/kate.spec
@@ -17,17 +17,13 @@
Name: kate
-Version: 4.10.1
+Version: 4.10.2
Release: 0
Summary: Advanced Text Editor
License: GPL-2.0+
Group: Productivity/Editors/Other
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
@@ -48,8 +44,6 @@ Kate is an advanced text editor for KDE.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
%ifarch ppc64
diff --git a/use-a-numeric-comparision.patch b/use-a-numeric-comparision.patch
deleted file mode 100644
index 0e7f5c5..0000000
--- a/use-a-numeric-comparision.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Shaheed Haque <srhaque@theiet.org>
-Date: Sat, 09 Mar 2013 15:41:34 +0000
-Subject: Fix Pate build for Qt 4.10
-X-Git-Url: http://quickgit.kde.org/?p=kate.git&a=commitdiff&h=106f4ee310796170a28786a32f2a235d5464f83c
----
-Fix Pate build for Qt 4.10
-
-Use a numeric comparision, not a case-sensitive sring comparision!
----
-
-
---- a/kate/plugins/pate/CMakeLists.txt
-+++ b/kate/plugins/pate/CMakeLists.txt
-@@ -42,7 +42,7 @@
- return()
- endif (NOT PYTHON_LIBRARY)
- if (NOT SIP_FOUND OR 0x${SIP_VERSION} LESS 0x40701)
-- message(WARNING "Pate plugin needs SIP 4.7.1 or later.")
-+ message(WARNING "Pate plugin needs SIP 4.7.1 or later. " ${SIP_VERSION})
- return()
- endif (NOT SIP_FOUND OR 0x${SIP_VERSION} LESS 0x40701)
- if (NOT SIP_EXECUTABLE OR NOT EXISTS ${SIP_EXECUTABLE})
-@@ -57,10 +57,10 @@
- message(WARNING "Pate plugin needs the PyKDE4 development sip files kdecoremod.sip")
- return()
- endif()
--if (NOT PYQT4_FOUND OR PYQT4_VERSION LESS "040301")
-- message(WARNING "Pate plugin needs PyQT 4.3.1 or later.")
-+if (NOT PYQT4_FOUND OR 0x${PYQT4_VERSION} LESS 0x040301)
-+ message(WARNING "Pate plugin needs PyQT 4.3.1 or later. " ${PYQT4_VERSION})
- return()
--endif (NOT PYQT4_FOUND OR PYQT4_VERSION LESS "040301")
-+endif (NOT PYQT4_FOUND OR 0x${PYQT4_VERSION} LESS 0x040301)
- if (NOT PYKDE4_FOUND)
- message(WARNING "Pate plugin needs PyKDE4.")
- return()
-