diff --git a/.cvsignore b/.cvsignore
index 6be4746..2be6065 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kdemultimedia-3.2.3-patched.tar.bz2
+kdemultimedia-3.2.92-patched.tar.bz2
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index 1bb1228..8b4f67c 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -14,6 +14,7 @@
 %define juk 0
 %define cdparanoia 1
 %define koncd 0
+%define arts 1
 
 %define redhatify 1
 
@@ -25,8 +26,8 @@
 %define patch_name -patched
 %endif
 
-Version: 3.2.3
-Release: 2
+Version: 3.2.92
+Release: 1
 Epoch: 6
 Name: kdemultimedia
 Prefix: /usr
@@ -39,7 +40,6 @@ Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}.tar.bz2
 
 Patch1: kde-libtool.patch
-Patch2: kdemultimedia-misc.patch
 
 Prereq: /sbin/ldconfig
 
@@ -68,32 +68,9 @@ BuildRequires: cdparanoia-devel
 %if %{juk}
 BuildRequires: taglib => 1.0
 %endif
-Obsoletes: %{name}-libs
-Obsoletes: %{name}-brahms
-Obsoletes: %{name}-arts
-Obsoletes: %{name}-kfile
-Obsoletes: kaboodle
-Obsoletes: noatun
-Obsoletes: kmid
-Obsoletes: kmidi
-Obsoletes: kmix
-Obsoletes: koncd
-Obsoletes: kscd
-Obsoletes: aktion
 %if %{juk}
 Obsoletes: juk
 %endif
-Provides: %{name}-libs
-Provides: %{name}-brahms
-Provides: %{name}-arts
-Provides: %{name}-kfile
-Provides: kaboodle
-Provides: noatun
-Provides: kmid
-Provides: kmidi
-Provides: kmix
-Provides: koncd
-Provides: kscd
 
 %description
 The K Desktop Environment (KDE) is a GUI desktop for the X Window
@@ -126,7 +103,6 @@ noatun plugins.
 %prep
 %setup -q -n %{name}-%{version}%{patch_name}
 %patch1 -p1
-%patch2 -p1 -b .misc
 
 # remove aktion, we don't ship xanim (license problems)
 %if %{redhatify}
@@ -150,10 +126,12 @@ export CXXFLAGS="$FLAGS -fno-use-cxa-atexit"
    export DO_NOT_COMPILE="mpeglib mpeglib_artsplug mpg123_artsplugin"
 %endif
 
+%if %{arts}
 export CFLAGS="$CFLAGS `artsc-config --cflags`"
 export CXXFLAGS="$CXXFLAGS `artsc-config --cflags`"
 export CPPFLAGS="$CPPFLAGS `artsc-config --cflags`"
 export LDFLAGS="$LDFLAGS `artsc-config --libs`"
+%endif
 
 %configure --with-qt-libraries=$QTDIR/lib \
            --disable-motif \
@@ -164,6 +142,9 @@ export LDFLAGS="$LDFLAGS `artsc-config --libs`"
 %if %{cdparanoia} == 0
            --disable-cdparanoia \
 %endif
+%if %{arts} == 0
+           --without-arts \
+%endif
 %if %{alsa}
            --with-alsa \
            --with-arts-alsa \
@@ -249,14 +230,17 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/HTML/en/kscd
 %doc %{_docdir}/HTML/en/noatun
 
+/etc/xdg/menus/applications-merged/*
 %{_libdir}/mcop/*
 %{_libdir}/*.so*
 %{_libdir}/*.la
 %{_libdir}/kde3/*
 %{_bindir}/*
+%{_datadir}/autostart/*
 %{_datadir}/applications/*
 %{_datadir}/apps/*
 %{_datadir}/config.kcfg/*
+%{_datadir}/desktop-directories/*
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/mimelnk/*
 %{_datadir}/services/*
@@ -267,8 +251,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/kde/*
 
 %changelog
-* Fri Jun 25 2004 Than Ngo <than@redhat.com> 6:3.2.3-2
-- rebuilt
+* Fri Jul 30 2004 Than Ngo <than@redhat.com> 3.2.92-1
+- update to 3.3 Beta2
+
+* Mon Jul 05 2004 Than Ngo <than@redhat.com> 6:3.2.91-1
+- update to 3.3 Beta 1
 
 * Sat Jun 19 2004 Than Ngo <than@redhat.com> 3.2.3-1
 - update to 3.2.3
diff --git a/sources b/sources
index cf26974..4371180 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a4a1f4479368c38ab44e5440df5a970  kdemultimedia-3.2.3-patched.tar.bz2
+a4c18587655dfc439178976fd6c5613f  kdemultimedia-3.2.92-patched.tar.bz2