diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index c98e092..48278f3 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -8,7 +8,7 @@
 
 %define debug 0
 
-%define release_number 1
+%define release_number 2
 
 %define build_for_ftp 0
 
@@ -97,11 +97,7 @@ player.
 Summary: Additional functionality for the aRts sound system
 Group: Applications/Multimedia
 Obsoletes: kdemultimedia
-%if ! %{build_mpeglib}
-Obsoletes: kdemultimedia-libs
-%else
 Requires: %{name}-libs
-%endif
 
 %description arts
 Additional functionality for the aRts sound system.
@@ -114,9 +110,6 @@ Summary: Development files for aRts plugins
 Group: Development/Libraries
 Requires: kdemultimedia-arts = %{version}
 Requires: noatun = %{version}
-%if ! %{build_mpeglib}
-Obsoletes: kdemultimedia-libs
-%endif
 
 %description devel
 Development files for aRts and noatun plugins.
@@ -128,9 +121,6 @@ noatun plugins.
 Summary: A KDE media player
 Group: Applications/Multimedia
 Obsoletes: kdemultimedia
-%if ! %{build_mpeglib}
-Obsoletes: kdemultimedia-libs
-%endif
 
 %description -n kaboodle
 A KDE media player. Kaboodle supports playback of Ogg, MP3 (including streaming
@@ -140,9 +130,6 @@ MP3), MP2, WAV and MOD audio files as well as MPEG video files.
 Summary: A KDE media player
 Group: Applications/Multimedia
 Obsoletes: kdemultimedia
-%if ! %{build_mpeglib}
-Obsoletes: kdemultimedia-libs
-%endif
 
 %description -n noatun
 A KDE media player. Noatun supports playback of Ogg, MP3 (including streaming
@@ -152,9 +139,6 @@ MP3), MP2, WAV and MOD audio files as well as MPEG video files.
 Summary: KFile support for audio files
 Group: Applications/Multimedia
 Obsoletes: kdemultimedia
-%if ! %{build_mpeglib}
-Obsoletes: kdemultimedia-libs
-%endif
 
 %description kfile
 Installing kdemultimedia-kfile allows all KFile aware applications (most KDE
@@ -165,9 +149,6 @@ files.
 Summary: A MIDI player (using the soundcard's sequencer functionality)
 Group: Applications/Multimedia
 Obsoletes: kdemultimedia
-%if ! %{build_mpeglib}
-Obsoletes: kdemultimedia-libs
-%endif
 
 %description -n kmid
 A MIDI player using the soundcard's sequencer functionality. kmid plays MIDI
@@ -184,9 +165,6 @@ Summary: A MIDI player (converting to digital audio)
 Group: Applications/Multimedia
 Obsoletes: kdemultimedia
 Requires: timidity++
-%if ! %{build_mpeglib}
-Obsoletes: kdemultimedia-libs
-%endif
 
 %description -n kmidi
 A MIDI player. Kmidi works by converting MIDI files to digital audio and
@@ -202,9 +180,6 @@ devices or your soundcard's builtin sequencer, try kmid instead.
 Summary: KDE sound mixer applet
 Group: Applications/Multimedia
 Obsoletes: kdemultimedia
-%if ! %{build_mpeglib}
-Obsoletes: kdemultimedia-libs
-%endif
 
 %description -n kmix
 A sound mixer applet for KDE. kmix allows you to control the volumes of your
@@ -223,9 +198,6 @@ KOnCD is a graphical frontend for mastering and burning CD-ROMs.
 Summary: Audio-CD player for KDE
 Group: Applications/Multimedia
 Obsoletes: kdemultimedia
-%if ! %{build_mpeglib}
-Obsoletes: kdemultimedia-libs
-%endif
 
 %description -n kscd
 KSCD is an Audio-CD player for KDE.
@@ -456,22 +428,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files arts
 %defattr(-,root,root)
-%{_libdir}/mcop/Arts/*
-%{_libdir}/mcop/arts*
-%if %{build_mpeglib}
-%{_libdir}/mcop/*PlayObject.mcopclass
-%{_libdir}/mcop/mpg123*
-%{_libdir}/libmpg*
-%{_libdir}/libarts_*
-%endif
-%{_libdir}/mcop/ogg*
-%{_libdir}/libartsbuilder*
-%{_libdir}/libartsgui*
-%{_libdir}/libartsmidi*
-%{_libdir}/libartsmodules*
-%{_libdir}/libaudiofile*
-%{_libdir}/mcop/audiofile*
-%{_libdir}/libogg*
 %{_bindir}/arts*
 %{_bindir}/midisend
 %{_datadir}/apps/artsbuilder
@@ -606,13 +562,27 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %doc %{_docdir}/HTML/en/noatun
 
-%if %{build_mpeglib}
 %files libs
 %defattr(-,root,root)
+%if %{build_mpeglib}
 %{_libdir}/libmpeg*
 %{_libdir}/libyaf*
 %{_bindir}/yaf-*
+%{_libdir}/mcop/*PlayObject.mcopclass
+%{_libdir}/mcop/mpg123*
+%{_libdir}/libmpg*
+%{_libdir}/libarts_*
 %endif
+%{_libdir}/mcop/Arts/*
+%{_libdir}/mcop/arts*
+%{_libdir}/mcop/ogg*
+%{_libdir}/libartsbuilder*
+%{_libdir}/libartsgui*
+%{_libdir}/libartsmidi*
+%{_libdir}/libartsmodules*
+%{_libdir}/libaudiofile*
+%{_libdir}/mcop/audiofile*
+%{_libdir}/libogg*
 
 %files devel
 %defattr(-,root,root)
@@ -641,6 +611,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed May  7 2003 Than Ngo <than@redhat.com 3.0.5a-2
+- fix package conflict
+
 * Sun Dec 22 2002 Than Ngo <than@redhat.com 3.0.5a-1
 - 3.0.5a
 - set my_vendor kde