From 3f679d9eb3df8d2d5f62fbf9eb2a78ebd2207282 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mar 10 2008 09:51:15 +0000 Subject: - apply upstream patch to fix regression in kate (bz#436384) --- diff --git a/kdelibs-3.5.9-kate-regression.patch b/kdelibs-3.5.9-kate-regression.patch new file mode 100644 index 0000000..012df13 --- /dev/null +++ b/kdelibs-3.5.9-kate-regression.patch @@ -0,0 +1,11 @@ +--- 3.5/kdelibs/kate/part/katesupercursor.cpp 2008/02/08 14:17:43 772352 ++++ 3.5/kdelibs/kate/part/katesupercursor.cpp 2008/02/20 11:02:18 777286 +@@ -186,7 +186,7 @@ + { + if (newLine) + { +- if (m_line > int(line) || (m_line == int(line) && m_col > int(col))) ++ if (m_line > int(line) || (m_line == int(line) && m_col >= int(col))) + { + if(m_line == int(line)) + m_col -= col; diff --git a/kdelibs3.spec b/kdelibs3.spec index 30a1da8..7bfbcc0 100644 --- a/kdelibs3.spec +++ b/kdelibs3.spec @@ -23,7 +23,7 @@ Summary: K Desktop Environment 3 - Libraries Version: 3.5.9 -Release: 4%{?dist} +Release: 5%{?dist} %if 0%{?fedora} > 8 Name: kdelibs3 @@ -79,6 +79,7 @@ Patch102: kdelibs-3.5.6-137675.patch Patch103: kdelibs-3.5.0-101956.patch ## upstream patches +Patch200: kdelibs-3.5.9-kate-regression.patch %{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}} Requires: qt >= %{qt_epoch}:%{qt_ver} @@ -244,6 +245,7 @@ format for easy browsing %patch102 -p0 -b .kde#137675 # upstream patches +%patch200 -p1 -b .kate-regression sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h @@ -571,6 +573,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : %changelog +* Mon Mar 10 2008 Than Ngo 3.5.9-5 +- apply upstream patch to fix regression in kate (bz#436384) + * Tue Mar 04 2008 Kevin Kofler - 3.5.9-4 - hardcode qt_ver again because 3.3.8b reports itself as 3.3.8 (fixes apidocs)