[kate/f20: 15/17] Revert "4.11.4"

[Rex Dieter]

commit 9b6d7a06d91ba7e47cd38d3b0a8d4caff5d964d3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Feb 2 20:24:24 2014 -0600

    Revert "4.11.4"
    
    This reverts commit db9b3e90dcb3fac0debcd1dbf02205ac0bad4c82.

 .gitignore                                         |    2 +-
 0001-cmake_utils-fix-SyntaxError-on-Python-2.patch |   30 ++++++++++++++++++++
 kate.spec                                          |   11 ++++---
 sources                                            |    2 +-
 4 files changed, 38 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c89b291..14698bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kate-4.11.4.tar.xz
+/kate-4.11.3.tar.xz
diff --git a/0001-cmake_utils-fix-SyntaxError-on-Python-2.patch b/0001-cmake_utils-fix-SyntaxError-on-Python-2.patch
new file mode 100644
index 0000000..2ca61be
--- /dev/null
+++ b/0001-cmake_utils-fix-SyntaxError-on-Python-2.patch
@@ -0,0 +1,30 @@
+From db0e2c6ddf3d909364e47c7daff68ee624d951c8 Mon Sep 17 00:00:00 2001
+From: "T.C. Hollingsworth" <tchollingsworth at gmail.com>
+Date: Fri, 1 Nov 2013 13:11:47 -0700
+Subject: [PATCH] cmake_utils: fix SyntaxError on Python 2
+
+named keyword arguments after *args are only valid in Python 3:
+http://stackoverflow.com/a/9873280/1263384
+
+(cherry picked from commit 3a803506551797cd20f52b37323484db294dd68f)
+---
+ .../pate/src/plugins/cmake_utils/command_completers/param_types.py     | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/addons/kate/pate/src/plugins/cmake_utils/command_completers/param_types.py b/addons/kate/pate/src/plugins/cmake_utils/command_completers/param_types.py
+index f4d698d..edc5b8d 100644
+--- a/addons/kate/pate/src/plugins/cmake_utils/command_completers/param_types.py
++++ b/addons/kate/pate/src/plugins/cmake_utils/command_completers/param_types.py
+@@ -211,7 +211,8 @@ class MultiSignature(object):
+ class OneOf(object):
+     '''Class to choose one of possible syntax'''
+ 
+-    def __init__(self, *syntaxes, exppos = None):
++    def __init__(self, *syntaxes, **kwargs):
++        exppos = kwargs['exppos']
+         self.syntaxes = syntaxes
+         assert(exppos is None or isinstance(exppos, int))
+         self.exppos = exppos
+-- 
+1.8.4.2
+
diff --git a/kate.spec b/kate.spec
index fff09ef..eb12cb4 100644
--- a/kate.spec
+++ b/kate.spec
@@ -4,8 +4,8 @@
 
 Name:    kate
 Summary: Advanced Text Editor 
-Version: 4.11.4
-Release: 1%{?dist}
+Version: 4.11.3
+Release: 3%{?dist}
 
 # kwrite LGPLv2+
 # kate: app LGPLv2, plugins, LGPLv2 and LGPLv2+ and GPLv2+
@@ -24,6 +24,8 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar
 ## upstreamable patches
 
 ## upstream patches
+# fix -pate build
+Patch0001: 0001-cmake_utils-fix-SyntaxError-on-Python-2.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: kactivities-devel >= %{version}
@@ -95,6 +97,8 @@ Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
 %prep
 %setup -q
 
+%patch0001 -p1 -b .0001
+
 
 %build
 mkdir -p %{_target_platform}
@@ -225,9 +229,6 @@ fi
 
 
 %changelog
-* Fri Dec 13 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.11.4-1
-- 4.11.4
-
 * Mon Dec 02 2013 Rex Dieter <rdieter at fedoraproject.org> 4.11.3-3
 - missing python-foo requires for pate plugins (#1028819)
 
diff --git a/sources b/sources
index 240b977..6adef25 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-edd1f95a7762472894ed357473524f13  kate-4.11.4.tar.xz
+da8926024503aed4e109543ad557b326  kate-4.11.3.tar.xz