rpms/kdelibs/F-8 kdelibs-3.5.9-kate-regression.patch, NONE, 1.1 kdelibs.spec, 1.250, 1.251

Than Ngo (than) fedora-extras-commits at redhat.com
Mon Mar 10 09:54:36 UTC 2008


Author: than

Update of /cvs/extras/rpms/kdelibs/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27416

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.9-kate-regression.patch 
Log Message:
apply upstream patch to fix regression in kate (bz#436384)


kdelibs-3.5.9-kate-regression.patch:

--- NEW FILE kdelibs-3.5.9-kate-regression.patch ---
--- 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;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-8/kdelibs.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- kdelibs.spec	4 Mar 2008 23:10:00 -0000	1.250
+++ kdelibs.spec	10 Mar 2008 09:53:58 -0000	1.251
@@ -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 @@
 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 @@
 %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 @@
 
 
 %changelog
+* Mon Mar 10 2008 Than Ngo <than at redhat.com> 3.5.9-5
+- apply upstream patch to fix regression in kate (bz#436384)
+
 * Tue Mar 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-4
 - hardcode qt_ver again because 3.3.8b reports itself as 3.3.8 (fixes apidocs)
 




More information about the fedora-extras-commits mailing list