rpms/kdebase/devel kdebase-3.5.3-kde#87613.patch, NONE, 1.1 kdebase-3.5.3-kioslave_media_dbus-fuser.patch, NONE, 1.1 kdebase.spec, 1.193, 1.194

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23703

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.3-kde#87613.patch 
	kdebase-3.5.3-kioslave_media_dbus-fuser.patch 
Log Message:
- fix #187228, kio_media_mounthelper fails with fuser
- apply upstream patches, fix #87613



kdebase-3.5.3-kde#87613.patch:
 systemtrayapplet.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-3.5.3-kde#87613.patch ---
Index: kicker/applets/systemtray/systemtrayapplet.cpp
===================================================================
--- kicker/applets/systemtray/systemtrayapplet.cpp	(Revision 544662)
+++ kicker/applets/systemtray/systemtrayapplet.cpp	(Revision 544663)
@@ -596,7 +596,7 @@
             ((*emb)->kdeTray() &&
              !kwin_module->systemTrayWindows().contains(wid)))
         {
-            delete *emb;
+            (*emb)->deleteLater();
             emb = m_shownWins.erase(emb);
         }
         else
@@ -613,7 +613,7 @@
             ((*emb)->kdeTray() &&
              !kwin_module->systemTrayWindows().contains(wid)))
         {
-            delete *emb;
+            (*emb)->deleteLater();
             emb = m_hiddenWins.erase(emb);
         }
         else

kdebase-3.5.3-kioslave_media_dbus-fuser.patch:
 halbackend.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-3.5.3-kioslave_media_dbus-fuser.patch ---
--- kdebase-3.5.3/kioslave/media/mediamanager/halbackend.cpp.tn	2006-06-20 12:51:16.000000000 +0200
+++ kdebase-3.5.3/kioslave/media/mediamanager/halbackend.cpp	2006-06-20 12:52:55.000000000 +0200
@@ -1210,7 +1210,7 @@
       QString qerror = error.message;
       if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) {
 	qerror = QString("<qt>") + i18n("Device is Busy:");
-	QString cmdline = QString("/bin/fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
+	QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
 	FILE *fuser = popen(cmdline.latin1(), "r");
 	uint counter = 0;
 	if (fuser) {


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- kdebase.spec	28 Jun 2006 11:53:05 -0000	1.193
+++ kdebase.spec	6 Jul 2006 17:51:25 -0000	1.194
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 7
+Release: 8
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -53,6 +53,7 @@
 Patch16: kdebase-3.5.2-krdb-xresource.patch
 Patch17: kdebase-3.3.1-pam_krb5-bz#191049.patch
 Patch18: kdebase-3.5.2-kconf_update-klipper.patch
+Patch19: kdebase-3.5.3-kioslave_media_dbus-fuser.patch
 
 # upstream patches
 Patch100: kdebase-3.5.3-kfind-largefile.patch
@@ -60,6 +61,7 @@
 Patch102: kdebase-3.5.3-kscreensaver.patch
 Patch103: kdebase-3.5.3-kxkb-kcmlayout.patch
 Patch104: kdebase-3.5.3.diff
+Patch105: kdebase-3.5.3-kde#87613.patch
 
 # Security fixes
 # Patch 300, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
@@ -168,6 +170,7 @@
 %patch16 -p1 -b .krdb-xresource
 %patch17 -p1 -b .pam_krb5-bz#191049
 %patch18 -p1 -b .klipper
+%patch19 -p1 -b .fuser
 
 # upstream patches
 %patch100 -p1 -b .kfind-largefile
@@ -175,6 +178,7 @@
 %patch102 -p1 -b .kscreensaver
 %patch103 -p1 -b .kxkb-kcmlayout
 %patch104 -p0 -b .setuid-check
+%patch105 -p0 -b .kde#87613
 
 # security fixes
 %patch300 -p0 -b .CVE-2006-2449
@@ -426,7 +430,7 @@
 %{_bindir}/kate
 %{_bindir}/kblankscrn.kss
 %{_bindir}/kbookmarkmerger
-%attr(4755,root,root) %{_bindir}/kcheckpass
+%{_bindir}/kcheckpass
 %{_bindir}/kcheckrunning
 %{_bindir}/kcminit
 %{_bindir}/kcminit_startup
@@ -546,6 +550,10 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Thu Jul 06 2006 Than Ngo <than at redhat.com> 6:3.5.3-8
+- fix #187228, kio_media_mounthelper fails with fuser
+- apply upstream patches, fix #87613
+
 * Mon Jun 26 2006 Than Ngo <than at redhat.com> 6:3.5.3-7
 - apply patch to check return value