rpms/kdelibs/devel kdelibs-3.5.3-kde#116092.patch, NONE, 1.1 kdelibs.spec, 1.159, 1.160

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Jul 20 12:55:56 UTC 2006


Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17978

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.3-kde#116092.patch 
Log Message:
- apply upstream patches,
   fix kde#130831, remember when the last replacement string was the empty string


kdelibs-3.5.3-kde#116092.patch:
 kreplacedialog.cpp |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.3-kde#116092.patch ---
Index: kutils/kreplacedialog.cpp
===================================================================
--- kutils/kreplacedialog.cpp	(Revision 563821)
+++ kutils/kreplacedialog.cpp	(Revision 563822)
@@ -28,6 +28,7 @@
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
+#include <kdebug.h>
 
 /**
  * we need to insert the strings after the dialog is set
@@ -101,7 +102,11 @@
 
 QStringList KReplaceDialog::replacementHistory() const
 {
-    return m_replace->historyItems();
+    QStringList lst = m_replace->historyItems();
+    // historyItems() doesn't tell us about the case of replacing with an empty string
+    if ( m_replace->lineEdit()->text().isEmpty() )
+        lst.prepend( QString::null );
+    return lst;
 }
 
 void KReplaceDialog::setOptions(long options)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- kdelibs.spec	18 Jul 2006 20:34:59 -0000	1.159
+++ kdelibs.spec	20 Jul 2006 12:55:54 -0000	1.160
@@ -17,7 +17,7 @@
 %define arts 1
 
 Version: 3.5.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -65,6 +65,7 @@
 Patch113: kdelibs-3.5.3-kde#106795.patch
 Patch114: kdelibs-3.5.3-kde#130605.patch
 Patch115: kdelibs-3.5.3-kde#129187.patch
+Patch116: kdelibs-3.5.3-kde#116092.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -209,6 +210,7 @@
 %patch113 -p0 -b .kde#106795
 %patch114 -p0 -b .kde#130605
 %patch115 -p0 -b .kde#129187
+%patch116 -p0 -b .kde#116092
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -433,6 +435,10 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Thu Jul 20 2006 Than Ngo <than at redhat.com> 6:3.5.3-11
+- apply upstream patches,
+   fix kde#130831, remember when the last replacement string was the empty string
+
 * Tue Jul 18 2006 Petr Rockai <prockai at redhat.com> - 6:3.5.3-10
 - do not ship the dummy kdnssd implementation, depend on external one
   (there is one provided by kdnssd-avahi now)




More information about the fedora-cvs-commits mailing list