rpms/kdewebdev/FC-3 fix-kdewebdev-kommander.diff, NONE, 1.1 kdewebdev.spec, 1.3, 1.4

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdewebdev/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv23336

Modified Files:
	kdewebdev.spec 
Added Files:
	fix-kdewebdev-kommander.diff 
Log Message:
fix post-3.3.2-kdewebdev-kommander.diff
- By default KURL::directory() strips the trailing slash and so, /tmp does not 
starts with /tmp


fix-kdewebdev-kommander.diff:
 instance.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix-kdewebdev-kommander.diff ---
Index: kommander/executor/instance.cpp
===================================================================
RCS file: /home/kde/kdewebdev/kommander/executor/instance.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -d -p -b -r1.53 -r1.54
--- kommander/executor/instance.cpp	18 Mar 2005 12:57:57 -0000	1.53
+++ kommander/executor/instance.cpp	2 May 2005 09:58:17 -0000	1.54
@@ -147,7 +147,7 @@ bool Instance::run(QFile *a_file)
   
   bool inTemp = false;
   for (QStringList::ConstIterator I = tmpDirs.begin(); I != tmpDirs.end(); ++I)
-    if (m_uiFileName.directory().startsWith(*I))
+    if (m_uiFileName.directory(false).startsWith(*I))
       inTemp = true;
         
   if (inTemp)


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-3/kdewebdev.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdewebdev.spec	27 Apr 2005 17:58:57 -0000	1.3
+++ kdewebdev.spec	2 May 2005 12:38:24 -0000	1.4
@@ -7,7 +7,7 @@
 %define kde_version 3.3.1
 
 Version: 3.3.1
-Release: 2.1
+Release: 2.2
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
@@ -25,7 +25,8 @@
 
 Patch0: javascript.patch
 # KDE Security Advisory: Kommander untrusted code execution CAN-2005-0754
-Patch1: post-3.3.2-kdewebdev-kommander.diff
+Patch100: post-3.3.2-kdewebdev-kommander.diff
+Patch101: fix-kdewebdev-kommander.diff
 
 Prereq: /sbin/ldconfig
 Requires: kdelibs >= %{kde_version}
@@ -56,7 +57,8 @@
 %prep
 %setup -q -a 1 -a 2 -a 3 -a 4
 %patch0 -p0 -b .javascript
-%patch1 -p0 -b .CAN-2005-0754
+%patch100 -p0 -b .CAN-2005-0754
+%patch101 -p0 -b .CAN-2005-0754
 
 %build
 QTDIR="" && . /etc/profile.d/qt.sh
@@ -136,6 +138,9 @@
 %{_includedir}/*
 
 %changelog
+* Mon May 02 2005 Than Ngo <than at redhat.com> 6:3.3.1-2.2
+- fix post-3.3.2-kdewebdev-kommander.diff
+
 * Wed Apr 27 2005 Than Ngo <than at redhat.com> 6:3.3.1-2.1
 - apply patch to fix CAN-2005-0754, Kommander untrusted code execution,
   thanks to KDE security team