fix kdebug:162189: Problems with deleting dirs on FTP server

This commit is contained in:
Lukas Tinkl 2008-05-21 14:48:47 +00:00
parent 1b7a8ccb24
commit e5d986d5c3
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,11 @@
--- 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);
}

View File

@ -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 @@ Patch15: kdelibs-4.0.4-proxy.patch
# 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 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch14 -p1 -b .libexecdir
%patch15 -p0 -b .proxy
%patch16 -p1 -b .phonon-hal
%patch17 -p1 -b .remote-encoding
%build
@ -358,6 +362,9 @@ rm -rf %{buildroot}
%changelog
* Wed May 21 2008 Lukáš Tinkl <ltinkl@redhat.com>
- fix problems with deleting dirs on FTP server (kdebug:162189)
* Thu May 15 2008 Lukáš Tinkl <ltinkl@redhat.com> - 4.0.4-4
- fix compatibility with newer HALs to find the actual HW info