diff --git a/.cvsignore b/.cvsignore
index e38f521..faeac52 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1 @@
-kdemultimedia-3.5.7.tar.bz2
-kdemultimedia-3.5.7-patched.tar.bz2
-kdemultimedia-3.5.7-patched-2.tar.bz2
-kdemultimedia-3.5.8-patched.tar.bz2
+kdemultimedia-3.97.0.tar.bz2
diff --git a/kdemultimedia-3.5.7-pthread.patch b/kdemultimedia-3.5.7-pthread.patch
deleted file mode 100644
index 70e2fe9..0000000
--- a/kdemultimedia-3.5.7-pthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdemultimedia-3.5.7-patched/xine_artsplugin/Makefile.am.pthread	2006-07-22 03:10:54.000000000 -0500
-+++ kdemultimedia-3.5.7-patched/xine_artsplugin/Makefile.am	2007-06-28 06:50:53.000000000 -0500
-@@ -8,7 +8,7 @@
- 			  xinePlayObject_impl.cpp \
- 			  audio_fifo_out.c
- libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread
--libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIB_X11) $(LIB_XEXT) \
-+libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIBPTHREAD) $(LIB_X11) $(LIB_XEXT) \
- 			 -lkmedia2_idl -lsoundserver_idl -lartsflow
- 
- libarts_xine_la_METASOURCES = AUTO
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index 3e39f74..ebbb425 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -1,7 +1,8 @@
+
 Name: kdemultimedia
 Epoch: 6
 Version: 3.97.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group: Applications/Multimedia
@@ -10,47 +11,37 @@ URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
 # FIXME/TODO: How to fix these? (taken from CMakeCache.txt)
 # CDPARANOIA_INCLUDE_DIR:PATH=CDPARANOIA_INCLUDE_DIR-NOTFOUND
 # FLAC_OGG_LIBRARY:FILEPATH=FLAC_OGG_LIBRARY-NOTFOUND
 
+BuildRequires: alsa-lib-devel
+BuildRequires: cdparanoia-devel cdparanoia
+BuildRequires: cmake
+BuildRequires: flac-devel
+BuildRequires: giflib-devel
 BuildRequires: kde-filesystem >= 4
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdebase-workspace-devel >= %{version}
-BuildRequires: cmake
-BuildRequires: taglib-devel
 BuildRequires: libmusicbrainz-devel
-BuildRequires: cdparanoia-devel cdparanoia
-BuildRequires: flac-devel
-BuildRequires: libvorbis-devel
 BuildRequires: libtheora-devel
-BuildRequires: giflib-devel
-BuildRequires: pcre-devel
-# Taken from CMakeCache.txt. Really needed?
-BuildRequires: alsa-lib-devel
-BuildRequires: libogg-devel
 BuildRequires: libtunepimp-devel
-BuildRequires: libXcomposite-devel
-BuildRequires: libXdamage-devel
-BuildRequires: libxkbfile-devel
-BuildRequires: libXpm-devel
-BuildRequires: libXv-devel
-BuildRequires: libXxf86misc-devel
-BuildRequires: libXScrnSaver-devel
-BuildRequires: libXtst-devel
-
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+BuildRequires: libvorbis-devel
+BuildRequires: pcre-devel
+BuildRequires: taglib-devel
+
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
+
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs4 >= %{version}
 Requires: kdebase-workspace >= %{version}
 
+Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+
 # FIXME/TODO: Taken from 3.5.8. review needed
 %description
-The K Desktop Environment (KDE) is a GUI desktop for the X Window
-System. The %{name} package contains multimedia applications for
-KDE, including:
+The %{name} package contains multimedia applications, including:
 * juk (a music manager and player)
 * kmix (an audio mixer)
 * kscd (an Audio-CD player)
@@ -59,17 +50,18 @@ KDE, including:
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
+Obsoletes: %{name}-extras-libs < %{?epoch:%{epoch}:}%{version}-%{release} 
 %description libs
 %{summary}.
 
-
 %package devel
 Group:    Development/Libraries
-Summary:  Header files for kdebase-workspace
+Summary:  Developer files for %{name} 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs4-devel kdebase-workspace-devel
 %description devel
-Header files for developing applications using %{name}.
+%{summary}.
+
 
 %prep
 %setup -q -n kdemultimedia-%{version}
@@ -87,33 +79,14 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-# move devel symlinks
-mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
-pushd %{buildroot}%{_kde4_libdir}
-for i in lib*.so
-do
-  case "$i" in
-    libkdeinit4_*.so)
-      ;;
-    # libspectreOkular.so is no symlink
-    libspectreOkular.so)
-      ;;
-    *)
-      linktarget=`readlink "$i"`
-        rm -f "$i"
-        ln -sf "../../$linktarget" "kde4/devel/$i"
-      ;;
-  esac
-done
-popd
+make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
 rm -rf %{buildroot}
 
+
 %post
 %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
@@ -125,10 +98,9 @@ rm -rf %{buildroot}
 %postun libs -p /sbin/ldconfig
 
 
-
 %files
 %defattr(-,root,root,-)
-%doc COPYING COPYING-DOCS README
+%doc COPYING README
 %{_kde4_bindir}/*
 %{_kde4_appsdir}/juk/
 %{_kde4_appsdir}/kmix/
@@ -139,27 +111,32 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/autostart/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/config.kcfg/*
-%{_kde4_datadir}/dbus-1/interfaces/*
+%{_datadir}/dbus-1/interfaces/*
 %{_kde4_docdir}/HTML/en/juk/
 %{_kde4_docdir}/HTML/en/kmix/
 %{_kde4_docdir}/HTML/en/kscd/
 %{_kde4_iconsdir}/hicolor/*/*/*
-%exclude %{_kde4_libdir}/kde4/devel/
+%{_kde4_libdir}/libkdeinit*.so
 
 %files libs
 %defattr(-,root,root,-)
-%doc COPYING.LIB
-%{_kde4_libdir}/*.so*
+%{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
-%exclude %{_kde4_libdir}/kde4/devel/
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/libkcddb/
 %{_kde4_includedir}/libkcompactdisc/
-%{_kde4_libdir}/kde4/devel/*
+%{_kde4_libdir}/lib*.so
+%exclude %{_kde4_libdir}/libkdeinit*.so
+
 
 %changelog
+* Fri Dec 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-3
+- -libs: Obsoletes: -extras(-libs)
+- cleanup BR's
+- omit parallel-install symlink hacks
+
 * Wed Dec 12 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.97.0-2
 - rebuild for changed _kde4_includedir