rpms/kdepim/devel kdepim-3.4.2-kmail-partNode-109003.patch, NONE, 1.1 kdepim.spec, 1.55, 1.56 admin-visibility.patch, 1.3, NONE kdepim-3.4.0-gcc4.patch, 1.1, NONE kdepim-3.4.1-misc.patch, 1.2, NONE kdepim-kpilot-fix.diff, 1.1, NONE

[fedora-cvs-commits redhat com]

Author: than

Update of /cvs/dist/rpms/kdepim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31412

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-3.4.2-kmail-partNode-109003.patch 
Removed Files:
	admin-visibility.patch kdepim-3.4.0-gcc4.patch 
	kdepim-3.4.1-misc.patch kdepim-kpilot-fix.diff 
Log Message:
- update 3.4.2
- apply patch to fix kmail bug, kde#109003


kdepim-3.4.2-kmail-partNode-109003.patch:
 partNode.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kdepim-3.4.2-kmail-partNode-109003.patch ---
--- kdepim-3.4.2/kmail/partNode.cpp.tn	2005-08-02 11:54:08.000000000 +0200
+++ kdepim-3.4.2/kmail/partNode.cpp	2005-08-02 11:56:25.000000000 +0200
@@ -36,6 +36,7 @@
 #include "kmmimeparttree.h"
 #include <mimelib/utility.h>
 #include <qregexp.h>
+#include <kasciistricmp.h>
 
 /*
   ===========================================================================
@@ -414,7 +415,7 @@
 partNode* partNode::findNodeForDwPart( DwBodyPart* part )
 {
     partNode* found = 0;
-    if( dwPart()->partId() == part->partId() )
+    if( kasciistricmp( dwPart()->partId(), part->partId() ) == 0 ) 
         return this;
     if( mChild )
         found = mChild->findNodeForDwPart( part );


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kdepim.spec	4 Jul 2005 16:50:22 -0000	1.55
+++ kdepim.spec	2 Aug 2005 10:10:06 -0000	1.56
@@ -2,13 +2,15 @@
 %define final 0
 
 %define qt_version 1:3.3.4
-%define arts_version 8:1.4.1
+%define arts_version 8:1.4.2
 
 %define arts 1
 %define make_cvs 1
 
-Version: 3.4.1
-Release: 2
+%define disable_gcc_check_and_hidden_visibility 1
+
+Version: 3.4.2
+Release: 1
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Prefix: /usr
@@ -26,17 +28,15 @@
 
 Patch1: kde-libtool.patch
 Patch3: kdepim-3.4.0-s390.patch
-Patch5: kdepim-3.4.0-gcc4.patch
 Patch6: kdepim-3.4.0-kandy-lockdev.patch
 Patch7: kdepim-3.4.0-kandy-icons.patch
-Patch8: kdepim-kpilot-fix.diff
-Patch9: kdepim-3.4.1-misc.patch
 
-# gcc4 workaround
-Patch100: admin-visibility.patch
+# upstream patches
+Patch200: kdepim-3.4.2-kmail-partNode-109003.patch
 
 Requires: kdebase >= 6:%{version}
 
+BuildRequires: perl
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: desktop-file-utils
@@ -107,16 +107,10 @@
 %ifarch s390 s390x
 %patch3 -p1 -b .s390
 rm -rf kpilot
-%else
-pushd kpilot
-%patch8 -p0 -b .kpilot
-popd
 %endif
-%patch5 -p1 -b .gcc4
 %patch6 -p1 -b .lockdev
 %patch7 -p1 -b .kandy-icons
-%patch9 -p1 -b .misc
-%patch100 -p1 -b .gcc4_workaround
+%patch10 -p1 -b .
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -127,6 +121,13 @@
 
 cp -f %{SOURCE2} %{SOURCE3} %{SOURCE4} kandy/src
 
+%if %{disable_gcc_check_and_hidden_visibility}
+  # disable gcc check
+  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
+  # disable hidden visibility
+  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
+%endif
+
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -209,6 +210,10 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Aug 02 2005 Than Ngo <than redhat com> 6:3.4.2-1
+- update 3.4.2
+- apply patch to fix kmail bug, kde#109003
+
 * Mon Jul 04 2005 Than Ngo <than redhat com> 6:3.4.1-2
 - fix uninitialized variable warning #162311, #162312
 


--- admin-visibility.patch DELETED ---


--- kdepim-3.4.0-gcc4.patch DELETED ---


--- kdepim-3.4.1-misc.patch DELETED ---


--- kdepim-kpilot-fix.diff DELETED ---