diff --git a/.cvsignore b/.cvsignore
index 4dc64a9..e35bb4a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kdepim-3.0.3.tar.bz2
+kdepim-3.0.5a.tar.bz2
diff --git a/kdepim.spec b/kdepim.spec
index cfb14dc..77d8d50 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -1,48 +1,85 @@
+# gcc bug -> excludearch x86_64
+ExcludeArch: x86_64
+
+%define build_release 0
+%define build_beta 1
+%define build_snapshot 2
+
+%define isClean 1
+
+%define isBuild %{build_release}
+
+%define debug 0
+
+%define release_number 1
+
+%define build_for_ftp 0
+
 %define strip_bin 0
+%define final 0
+%define rpm_clean 1
+
+%define libtool 1
+
 %define desktop_file 1
-%define kcontrol_desktop_file 0
 %define desktop_file_utils_version 0.2.93
-%define is_release 1
-%define beta %{nil}
-%define DATE 20020326
-Version: 3.0.3
-%define rel 3
+
+%define kcontrol_desktop_file 0
+
+Version: 3.0.5a
 Name: kdepim
-%define ver %{version}%{beta}
 Summary: PIM (Personal Information Manager) for KDE
-%if %{is_release}
-Source: ftp://ftp.kde.org/pub/kde/releases/%{name}-%{ver}.tar.bz2
-%else
-Source: cvs://cvs.kde.org/%{name}-%{DATE}.tar.bz2
-%endif
-Source1: korganizerrc
-Patch: kdepim-3.0.0-configure.patch
-Patch1: kdepim-3.0.2-desktop.patch
 Prefix: /usr
 Icon: kde-icon.xpm
-URL: http://www.kde.org
-%if %{is_release}
-%if "%{beta}" != ""
-Release: 0.%{beta}.%{rel}
-%else
-Release: %{rel}
-%endif
-%else
-Release: 0.cvs%{DATE}.%{rel}
-%endif
 Epoch: 6
-Obsoletes: korganizer kpilot
 Group: Applications/Productivity
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-buildroot
+URL: http://www.kde.org
+
+%if "%{isBuild}" == "%{build_release}"
+%define release_name %{nil}
+Release: %{release_number}
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/distribution/tar/generic/source/%{name}-%{version}.tar.bz2
+%endif
+
+%if "%{isBuild}" == "%{build_beta}"
+%define release_name beta1
+Release: 0.%{release_name}.%{release_number}
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/distribution/tar/generic/source/%{name}-%{release_name}.tar.bz2
+%endif
+
+%if "%{isBuild}" == "%{build_snapshot}"
+%define release_name 20020807
+Release: 0.%{release_name}cvs.%{release_number}
+Source: cvs://cvs.kde.org/%{name}-%{release_name}.tar.bz2
+%endif
+
+%if %{build_for_ftp}
+ExclusiveArch: %{ix86}
+%endif
+
+Source1: korganizerrc
+Source900: gccver.c
+
+Patch1: kdepim-3.0.3-korganizer.patch
+Patch2: kdepim-3.0.5a-strlcpy.patch
+
+Obsoletes: korganizer kpilot
+
 Prereq: /sbin/ldconfig
-%ifnarch ia64 s390 s390x
+
+BuildRequires: kdebase-devel
+BuildRequires: qt-devel
+BuildRequires: zlib-devel
+
+%ifarch %{ix86} alpha ppc x86_64
 BuildRequires: pilot-link-devel >= 0.11
 %endif
+
 %if %{desktop_file}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 %endif
-Source900: gccver.c
 
 %description
 A PIM (Personal Information Manager) for KDE.
@@ -85,45 +122,52 @@ and accept drag and drop even from remote sites.
 Summary: Development files for kdepim
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: kdelibs-devel >= %{version}
 
 %description devel
 Development files for %{name}.
 Install %{name}-devel if you want to write or compile %{name} plugins.
 
 %prep
-%if %{is_release}
-%setup -q -n %{name}-%{ver}
+rm -rf $RPM_BUILD_ROOT
+
+%if "%{isBuild}" == "%{build_release}"
+%setup -q
 %else
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}-%{release_name}
 %endif
-#%patch -p1 -b .cfg
+
+%patch1 -p1 -b .plugins
+%patch2 -p1 -b .strlcpy
+
 %ifarch ia64 s390 s390x
 rm -rf kpilot doc/kpilot
 %endif
-%if !%{kcontrol_desktop_file}
-%patch1 -p1 -b .desktop
-%endif
 
 # Workaround for legacy auto* tools
+%if %{libtool}
 [ -x /usr/bin/autoconf-2.5? ] && ln -s /usr/bin/autoconf-2.5? autoconf
 [ -x /usr/bin/autoheader-2.5? ] && ln -s /usr/bin/autoheader-2.5? autoheader
 [ -x /usr/bin/aclocal-1.5 ] && ln -s /usr/bin/aclocal-1.5 aclocal
 [ -x /usr/bin/automake-1.5 ] && ln -s /usr/bin/automake-1.5 automake
 export PATH=`pwd`:$PATH
-# End workaround
-
-make -f Makefile.cvs
+make -f admin/Makefile.common cvs
+%endif
 
 %build
 export KDEDIR=%{prefix}
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DNDEBUG -UDEBUG" \
-CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -UDEBUG -DQT_THREAD_SUPPORT" \
-./configure  --prefix=%{prefix} --includedir=%{prefix}/include/kde
+CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -UDEBUG -DQT_THREAD_SUPPORT -fno-use-cxa-atexit" \
+./configure  --prefix=%{prefix} \
+             --libdir={prefix}/%{_lib} \
+             --includedir=%{prefix}/include/kde \
+             --libdir=%{_libdir}
+
 gcc -o gccver %{SOURCE900}
 if [ "0`./gccver`" -lt 3001 ]; then
-        find . -name Makefile |xargs perl -pi -e "s,^CXXLD\s*=.*,\$& -release gcc`./gccver -v`,g"
+   find . -name Makefile |xargs perl -pi -e "s,^CXXLD\s*=.*,\$& -release gcc`./gccver -v`,g"
 fi
 
 make %{?_smp_mflags}
@@ -136,24 +180,23 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 # hicolor icons for desktop files
 for i in 16x16 32x32 48x48 ; do
-  cp -f $RPM_BUILD_ROOT/usr/share/apps/kalarm/icons/hicolor/$i/apps/kalarm.png \
-        $RPM_BUILD_ROOT/usr/share/icons/hicolor/$i/apps/
+   cp -f $RPM_BUILD_ROOT/usr/share/apps/kalarm/icons/hicolor/$i/apps/kalarm.png \
+         $RPM_BUILD_ROOT/usr/share/icons/hicolor/$i/apps/
 done
 # locolor icons for desktop files
 mkdir -p $RPM_BUILD_ROOT/usr/share/icons/locolor
 for i in 16x16 32x32 ; do
-  cp -f $RPM_BUILD_ROOT/usr/share/apps/kalarm/icons/locolor/$i/apps/kalarm.png \
-        $RPM_BUILD_ROOT/usr/share/icons/locolor/$i/apps/
+   cp -f $RPM_BUILD_ROOT/usr/share/apps/kalarm/icons/locolor/$i/apps/kalarm.png \
+         $RPM_BUILD_ROOT/usr/share/icons/locolor/$i/apps/
 done
 
 # Make symlinks relative
-(
-  mkdir -p $RPM_BUILD_ROOT%{prefix}/share/doc/HTML/en/common
-  cd $RPM_BUILD_ROOT%{prefix}/share/doc/HTML/en
-  for i in *; do
-    [ -d $i -a -L $i/common ] && cd $i && ln -nfs ../common . && cd ..
-  done
-)
+mkdir -p $RPM_BUILD_ROOT%{prefix}/share/doc/HTML/en/common
+pushd $RPM_BUILD_ROOT%{prefix}/share/doc/HTML/en
+for i in *; do
+   [ -d $i -a -L $i/common ] && (cd $i && ln -nfs ../common . && cd ..)
+done
+popd
 
 cp %{SOURCE1} $RPM_BUILD_ROOT%{prefix}/share/config/
 
@@ -163,17 +206,26 @@ rm -f $RPM_BUILD_ROOT%{prefix}/share/applnk/Utilities/kpilotdaemon.desktop
 # desktop-file-install
 %if %{desktop_file}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+
+pushd $RPM_BUILD_ROOT%{_datadir}/applnk
+for i in `find . -name "*.desktop"`; do
+  grep "Hidden=true" $i >& /dev/null && rm -f $i
+done
+popd
+
 desktop-file-install --vendor kde \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   --delete-original \
    --add-category "Application;Utility;X-Red-Hat-Base" \
    --add-only-show-in KDE \
    $RPM_BUILD_ROOT%{_datadir}/applnk/Applications/kalarm*.desktop
 
 desktop-file-install --vendor kde \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   --delete-original \
    --add-category "Application;Utility;X-Red-Hat-Extra" \
    $RPM_BUILD_ROOT%{_datadir}/applnk/Applications/korganizer.desktop \
-%ifnarch ia64 s390 s390x
+%ifarch %{ix86} alpha ppc x86_64
    $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/kpilot.desktop \
 %endif
    $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/knotes.desktop \
@@ -188,10 +240,13 @@ mv $RPM_BUILD_ROOT%{_datadir}/applnk/Settings \
 %else
 desktop-file-install --vendor kde \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   --delete-original \
    --add-category "X-KDE-System" \
    --add-only-show-in KDE \
    $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/System/*.desktop
 %endif
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
 %endif
 
 %post -p /sbin/ldconfig
@@ -219,7 +274,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/apps/kalarm
 %{_datadir}/apps/korganizer
 %if %{desktop_file}
-%if %{kcontrol_desktop_file}
+%if "%{kcontrol_desktop_file}" == "1"
 %{_datadir}/apps/kcontrol/applnk/Preferences/System/alarmdaemon*
 %else
 %{_datadir}/applications/*alarmdaemon*
@@ -240,6 +295,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/servicetypes/korganizer*
 %config(noreplace) %{_datadir}/config/korganizerrc
 %doc %{_docdir}/HTML/en/korganizer
+%doc %{_docdir}/HTML/en/kalarm
 
 %files -n knotes
 %defattr(-,root,root)
@@ -266,14 +322,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/*/*/*/karm.png
 %doc %{_docdir}/HTML/en/karm/*
 
-%ifnarch ia64 s390 s390x
+%ifarch %{ix86} alpha ppc x86_64
 %files pilot
 %defattr(-,root,root)
 %{_bindir}/*pilot*
 %{_libdir}/kde3/*conduit*
 %{_libdir}/libkpilot*
 %{_datadir}/apps/kpilot
-%if %{desktop_file}
+%if "%{desktop_file}" == "1"
 %{_datadir}/applications/*pilot*
 %else
 %{_datadir}/applnk/Utilities/*pilot*
@@ -284,11 +340,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/HTML/en/kpilot/*
 %endif
 
-%ifnarch s390 s390x
+%ifarch %{ix86} alpha ppc x86_64 ia64
 %files cellphone
 %defattr(-,root,root)
 %{_bindir}/kandy*
-%if %{desktop_file}
+%if "%{desktop_file}" == "1"
 %{_datadir}/applications/*kandy*
 %else
 %{_datadir}/applnk/Utilities/kandy*
@@ -302,12 +358,28 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/kde/kgantt
 %{_includedir}/kde/calendar
 %{_includedir}/kde/korganizer
-%ifnarch s390 s390x ia64
+%ifarch %{ix86} alpha ppc x86_64
 %{_includedir}/kde/kpilot
 %endif
 %{_includedir}/kde/*.h
 
 %changelog
+* Sun Dec 22 2002 Than Ngo <than@redhat.com> 3.0.5a-1
+- update to 3.0.5a
+
+* Sat Nov  9 2002 Than Ngo <than@redhat.com> 3.0.5-1
+- update to 3.0.5
+
+* Wed Nov  6 2002 Than Ngo <than@redhat.com> 3.0.4-2
+- fix some build problems
+
+* Tue Oct 15 2002 Than Ngo <than@redhat.com> 3.0.4-1
+- 3.0.4
+
+* Sun Oct  6 2002 Than Ngo <than@redhat.com> 3.0.3-4
+- Fixed holiday plugin (bug #64750, #63438)
+- Added more buildrequires/equires (bug #56282,#73996)
+
 * Mon Sep  2 2002 Than Ngo <than@redhat.com> 3.0.3-3
 - Added missing icons
 
diff --git a/sources b/sources
index 4139c6c..b1179e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1cf00b8d2c4742e79569c2c43142a3e3  kdepim-3.0.3.tar.bz2
+a76899888e956ab89b11ded260860b52  kdepim-3.0.5a.tar.bz2