rpms/kdesdk/F-12 kdesdk-4.4.0-cervisia-kde#228587.patch, NONE, 1.1 kdesdk.spec, 1.156, 1.157

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdesdk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21139/F-12

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-4.4.0-cervisia-kde#228587.patch 
Log Message:
Sync from devel:

* Fri Feb 26 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.0-3
- fix Cervisia not to unconditionally enable auto spell checking (kde#228587)
- BR binutils-static (F13+)

kdesdk-4.4.0-cervisia-kde#228587.patch:
 logmessageedit.cpp |    9 +++++++--
 logmessageedit.h   |    1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE kdesdk-4.4.0-cervisia-kde#228587.patch ---
diff -ur kdesdk-4.4.0/cervisia/logmessageedit.cpp kdesdk-4.4.0-cervisia-kde#228587/cervisia/logmessageedit.cpp
--- kdesdk-4.4.0/cervisia/logmessageedit.cpp	2008-01-05 00:57:53.000000000 +0100
+++ kdesdk-4.4.0-cervisia-kde#228587/cervisia/logmessageedit.cpp	2010-02-26 11:20:12.000000000 +0100
@@ -33,6 +33,7 @@
     , KCompletionBase()
     , m_completing(false)
     , m_completionStartPos(0)
+    , m_checkSpellingEnabledBeforeCompletion(false)
 {
     // create the completion object
     completionObject();
@@ -67,6 +68,7 @@
 
     m_completing = true;
 
+    m_checkSpellingEnabledBeforeCompletion = checkSpellingEnabled();
     // disable spellchecker during completion process. Otherwise we lose the
     // text selection.
     setCheckSpellingEnabled(false);
@@ -152,8 +154,11 @@
 
 void LogMessageEdit::stopCompletion()
 {
-    m_completing = false;
-    setCheckSpellingEnabled(true);
+    if (m_completing)
+    {
+        m_completing = false;
+        setCheckSpellingEnabled(m_checkSpellingEnabledBeforeCompletion);
+    }
 }
 
 
diff -ur kdesdk-4.4.0/cervisia/logmessageedit.h kdesdk-4.4.0-cervisia-kde#228587/cervisia/logmessageedit.h
--- kdesdk-4.4.0/cervisia/logmessageedit.h	2008-01-05 00:57:53.000000000 +0100
+++ kdesdk-4.4.0-cervisia-kde#228587/cervisia/logmessageedit.h	2010-02-26 11:16:40.000000000 +0100
@@ -52,6 +52,7 @@
 
     bool m_completing;
     int  m_completionStartPos;
+    bool m_checkSpellingEnabledBeforeCompletion;
 };
 
 


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-12/kdesdk.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- kdesdk.spec	10 Feb 2010 16:50:11 -0000	1.156
+++ kdesdk.spec	26 Feb 2010 11:20:48 -0000	1.157
@@ -1,7 +1,7 @@
 
 Name:           kdesdk
 Version:        4.4.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -9,6 +9,8 @@ Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+# fix Cervisia not to unconditionally enable auto spell checking (kde#228587)
+Patch0:         kdesdk-4.4.0-cervisia-kde#228587.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # upstream patches
@@ -26,9 +28,11 @@ BuildRequires:  subversion-devel
 BuildRequires:  boost-devel
 BuildRequires:  libical-devel
 # for libiberty (used by kmtrace for cp_demangle)
-# IMPORTANT: check licensing from time to time, currently libiberty is still
-#            GPLv2+/LGPLv2+
 BuildRequires:  binutils-devel
+%if 0%{?fedora} > 12
+# libiberty is only static, in F13+ it's only in -static
+BuildRequires:  binutils-static
+%endif
 
 Requires: kdepimlibs%{?_isa} >= %{version}
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -57,6 +61,7 @@ A collection of applications and tools u
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
 
@@ -71,6 +76,7 @@ Files for developing applications using 
 %package utils
 Summary: Text utilities from %{name}
 Group:   Applications/Text
+%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 %description utils
 %{summary}, including:
 po2xml
@@ -81,6 +87,7 @@ xml2pot
 
 %prep
 %setup -q -n kdesdk-%{version}%{?alphatag}
+%patch0 -p1 -b .kde#228587
 
 
 %build
@@ -230,6 +237,14 @@ fi
 
 
 %changelog
+* Fri Feb 26 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.0-3
+- fix Cervisia not to unconditionally enable auto spell checking (kde#228587)
+- BR binutils-static (F13+)
+
+* Wed Feb 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.0-2
+- -utils: Requires: qt4 dep
+- -libs: Requires: %%name ...
+
 * Fri Feb 05 2010 Than Ngo <than at redhat.com> - 4.4.0-1
 - 4.4.0