rpms/kdelibs/F-9 kdelibs-4.0.4-remote-encoding.patch, NONE, 1.1 kdelibs.spec, 1.315, 1.316

[Lukas Tinkl (ltinkl)]

Author: ltinkl

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.0.4-remote-encoding.patch 
Log Message:
fix kdebug:162189: Problems with deleting dirs on FTP server


kdelibs-4.0.4-remote-encoding.patch:

--- NEW FILE kdelibs-4.0.4-remote-encoding.patch ---
--- kdelibs/kio/kio/kremoteencoding.cpp	2008/05/21 11:25:49	810706
+++ kdelibs/kio/kio/kremoteencoding.cpp	2008/05/21 11:26:15	810707
@@ -77,7 +77,7 @@
 
 QByteArray KRemoteEncoding::directory(const KUrl& url, bool ignore_trailing_slash) const
 {
-  QString dir = url.directory(ignore_trailing_slash ? KUrl::DirectoryOptions(0) : KUrl::ObeyTrailingSlash);
+  QString dir = url.directory(ignore_trailing_slash ? KUrl::DirectoryOptions(KUrl::IgnoreTrailingSlash) : KUrl::ObeyTrailingSlash);
 
   return encode(dir);
 }


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- kdelibs.spec	15 May 2008 13:36:15 -0000	1.315
+++ kdelibs.spec	21 May 2008 14:48:47 -0000	1.316
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -81,6 +81,9 @@
 # fix compatibility with newer HALs
 #Â http://websvn.kde.org/?view=rev&revision=807988
 Patch16: kdelibs-4.0.4-phonon-hal.patch
+#Â kdebug:162189: Problems with deleting dirs on FTP server
+#Â http://websvn.kde.org/?view=rev&revision=810707
+Patch17: kdelibs-4.0.4-remote-encoding.patch
 
 ## upstream patches
 
@@ -201,6 +204,7 @@
 %patch14 -p1 -b .libexecdir
 %patch15 -p0 -b .proxy
 %patch16 -p1 -b .phonon-hal
+%patch17 -p1 -b .remote-encoding
 
 
 %build
@@ -358,6 +362,9 @@
 
 
 %changelog
+* Wed May 21 2008 Lukáš Tinkl <ltinkl at redhat.com>
+- fix problems with deleting dirs on FTP server (kdebug:162189)
+
 * Thu May 15 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.4-4
 - fix compatibility with newer HALs to find the actual HW info