From e3d1d74e5a87d66e17b3c12234c8d9c928882909 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jul 01 2014 00:47:39 +0000 Subject: Merge branch 'master' into f20 --- diff --git a/.gitignore b/.gitignore index 78c4eb6..de2d172 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,2 @@ -/kate-4.11.3.tar.xz -/kate-4.11.90.tar.xz -/kate-4.11.95.tar.xz -/kate-4.11.97.tar.xz -/kate-4.12.0.tar.xz -/kate-4.12.1.tar.xz -/kate-4.12.2.tar.xz -/kate-4.12.3.tar.xz +/kate-4.13.1.tar.xz +/kate-4.13.2.tar.xz diff --git a/0001-fix-KeyError-exception-rollback-as-it-was-before-T.C.patch b/0001-fix-KeyError-exception-rollback-as-it-was-before-T.C.patch deleted file mode 100644 index df7717d..0000000 --- a/0001-fix-KeyError-exception-rollback-as-it-was-before-T.C.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3115a93d4f35cdb9ab37768cdc90a944c0a7f36d Mon Sep 17 00:00:00 2001 -From: Alex Turbov -Date: Tue, 5 Nov 2013 20:26:52 +0400 -Subject: [PATCH 01/29] fix KeyError exception (rollback as it was before T.C. - Hollingsworth broke it 4 days ago) - ---- - .../pate/src/plugins/cmake_utils/command_completers/param_types.py | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -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 edc5b8d..d32b6c0 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,8 +211,7 @@ class MultiSignature(object): - class OneOf(object): - '''Class to choose one of possible syntax''' - -- def __init__(self, *syntaxes, **kwargs): -- exppos = kwargs['exppos'] -+ def __init__(self, *syntaxes, exppos=None): - self.syntaxes = syntaxes - assert(exppos is None or isinstance(exppos, int)) - self.exppos = exppos --- -1.8.4.2 - diff --git a/kate-4.12.90-python_library_realpath.patch b/kate-4.12.90-python_library_realpath.patch new file mode 100644 index 0000000..d68699f --- /dev/null +++ b/kate-4.12.90-python_library_realpath.patch @@ -0,0 +1,21 @@ +diff -up kate-4.12.90/addons/kate/pate/src/CMakeLists.txt.python_library_realpath kate-4.12.90/addons/kate/pate/src/CMakeLists.txt +--- kate-4.12.90/addons/kate/pate/src/CMakeLists.txt.python_library_realpath 2014-03-18 22:20:51.136533633 -0500 ++++ kate-4.12.90/addons/kate/pate/src/CMakeLists.txt 2014-03-18 22:21:59.011807751 -0500 +@@ -37,6 +37,7 @@ add_definitions(-DQT_NO_KEYWORDS) + + kde4_add_ui_files(sources manager.ui) + ++get_filename_component(PYTHON_LIBRARY_REALPATH "${PYTHON_LIBRARY}" REALPATH CACHE) + configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) + + kde4_add_plugin(katepateplugin ${sources}) +diff -up kate-4.12.90/addons/kate/pate/src/config.h.cmake.python_library_realpath kate-4.12.90/addons/kate/pate/src/config.h.cmake +--- kate-4.12.90/addons/kate/pate/src/config.h.cmake.python_library_realpath 2014-03-09 23:43:10.000000000 -0500 ++++ kate-4.12.90/addons/kate/pate/src/config.h.cmake 2014-03-18 22:20:51.136533633 -0500 +@@ -17,5 +17,5 @@ + // the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + // Boston, MA 02110-1301, USA. + +-#define PATE_PYTHON_LIBRARY "${PYTHON_LIBRARY}" ++#define PATE_PYTHON_LIBRARY "${PYTHON_LIBRARY_REALPATH}" + #define PATE_PYTHON_SITE_PACKAGES_INSTALL_DIR "${PYTHON_SITE_PACKAGES_INSTALL_DIR}" diff --git a/kate.spec b/kate.spec index 90dea5b..eeb602a 100644 --- a/kate.spec +++ b/kate.spec @@ -6,7 +6,7 @@ Name: kate Summary: Advanced Text Editor -Version: 4.12.3 +Version: 4.13.2 Release: 1%{?dist} # kwrite LGPLv2+ @@ -24,10 +24,10 @@ URL: https://projects.kde.org/projects/kde/kdebase/kate Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz ## upstreamable patches +# https://bugzilla.redhat.com/show_bug.cgi?id=1050944 +Patch50: kate-4.12.90-python_library_realpath.patch ## upstream patches -# revert upstream commit that breaks build -Patch0001: 0001-fix-KeyError-exception-rollback-as-it-was-before-T.C.patch BuildRequires: desktop-file-utils BuildRequires: kactivities-devel >= %{version} @@ -62,7 +62,8 @@ Summary: Kate python plugin BuildRequires: pykde4-devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: pykde4 -%define python_library_path -DPYTHON_LIBRARY:PATH=%{_libdir}/libpython%{python_version}.so.1.0 +## use python_library_realpath patch instead +#define python_library_path -DPYTHON_LIBRARY:PATH=%{_libdir}/libpython%{python_version}.so.1.0 ## python_autocomplete: review pending, https://bugzilla.redhat.com/1028818 #Requires: python-pyplete ## python_console_ipython: @@ -100,7 +101,7 @@ Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} %prep %setup -q -%patch0001 -p1 -R -b .0001 +%patch50 -p1 -b .python_library_realpath %build @@ -230,10 +231,35 @@ fi %{_kde4_appsdir}/kate/plugins/pate/ %{_kde4_libdir}/kde4/katepateplugin.so %{_kde4_datadir}/kde4/services/pate.desktop +%{_kde4_datadir}/kde4/servicetypes/katepythonplugin.desktop %endif %changelog +* Mon Jun 09 2014 Rex Dieter - 4.13.2-1 +- 4.13.2 + +* Sun Jun 08 2014 Fedora Release Engineering - 4.13.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat May 10 2014 Rex Dieter 4.13.1-1 +- 4.13.1 + +* Sat Apr 12 2014 Rex Dieter - 4.13.0-1 +- 4.13.0 + +* Fri Apr 04 2014 Rex Dieter - 4.12.97-1 +- 4.12.97 + +* Sat Mar 22 2014 Rex Dieter - 4.12.95-1 +- 4.12.95 + +* Wed Mar 19 2014 Rex Dieter - 4.12.90-1 +- 4.12.90 + +* Fri Mar 07 2014 Rex Dieter 4.12.3-2 +- implement upstreamable PYTHON_LIBRARY_REALPATH fix (#1050944) + * Sat Mar 01 2014 Rex Dieter - 4.12.3-1 - 4.12.3 diff --git a/sources b/sources index e793b9d..01313ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e97a5a587e7b7b13cd247b12e2e5b3fd kate-4.12.3.tar.xz +58c365365f06611801f8151ec538d572 kate-4.13.2.tar.xz