rpms/kdebase-runtime/devel kdebase-runtime-4.0.3-kio_smb_browse.patch, NONE, 1.1 kdebase-runtime.spec, 1.24, 1.25

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Wed Apr 2 14:48:33 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28254

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.0.3-kio_smb_browse.patch 
Log Message:
* Wed Apr 02 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-3
- kio_smb patch (kde #156423)


kdebase-runtime-4.0.3-kio_smb_browse.patch:

--- NEW FILE kdebase-runtime-4.0.3-kio_smb_browse.patch ---
--- trunk/KDE/kdebase/runtime/kioslave/smb/kio_smb_browse.cpp	2007/08/03 06:48:25	695876
+++ trunk/KDE/kdebase/runtime/kioslave/smb/kio_smb_browse.cpp	2008/03/09 14:38:57	783762
@@ -374,7 +374,7 @@
                    // when libsmbclient knows
                    // u = QString("smb://%1?WORKGROUP=%2").arg(dirpName).arg(workgroup.toUpper());
                    kDebug(KIO_SMB) << "list item " << u;
-                   udsentry.insert( KIO::UDSEntry::UDS_URL, u.url());
+                   udsentry.insert(KIO::UDSEntry::UDS_TARGET_URL, u.url());
 
                    udsentry.insert(KIO::UDSEntry::UDS_MIME_TYPE, QString::fromLatin1("application/x-smb-server"));
                }
@@ -395,7 +395,7 @@
                // QString workgroup = m_current_url.host().toUpper();
                KUrl u("smb:/");
                u.setHost(dirpName);
-               udsentry.insert(KIO::UDSEntry::UDS_URL, u.url());
+               udsentry.insert(KIO::UDSEntry::UDS_TARGET_URL, u.url());
 
                // Call base class to list entry
                listEntry(udsentry, false);


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kdebase-runtime.spec	31 Mar 2008 16:26:25 -0000	1.24
+++ kdebase-runtime.spec	2 Apr 2008 14:47:57 -0000	1.25
@@ -9,7 +9,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       4.0.3
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -26,6 +26,9 @@
 %define rest 1
 #endif
 
+## upstream patches
+Patch100: kdebase-runtime-4.0.3-kio_smb_browse.patch
+
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 Provides:  kdebase4-runtime = %{version}-%{release}
 
@@ -88,6 +91,8 @@
 %prep
 %setup -q -n kdebase-runtime-%{version}
 
+%patch100 -p4 -b .kio_smb
+
 
 %build
 
@@ -287,6 +292,9 @@
 
 
 %changelog
+* Wed Apr 02 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-3
+- kio_smb patch (kde #156423)
+
 * Mon Mar 31 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-2
 - update file list for _kde4_libexecdir
 




More information about the fedora-extras-commits mailing list