diff --git a/.cvsignore b/.cvsignore
index a2db133..0f581fe 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kdegames-3.1.4.tar.bz2
+kdegames-3.1.95.tar.bz2
diff --git a/kdegames.spec b/kdegames.spec
index d1f58fa..f2e8619 100644
--- a/kdegames.spec
+++ b/kdegames.spec
@@ -2,20 +2,16 @@
 
 %define debug 0
 
-%define strip_bin 0
 %define final 0
 %define rpm_clean 1
 
-%define desktop_file 1
-%define desktop_file_utils_version 0.2.93
-
 %define kbattleship 0
 %define ktron 0
 
-%define qt_version 3.1.2
+%define qt_version 3.2.2
 
-Version: 3.1.4
-Release: 2
+Version: 3.1.95
+Release: 0.1
 Epoch: 6
 Summary: K Desktop Environment - Games
 Name: kdegames
@@ -27,12 +23,6 @@ BuildRoot: %{_tmppath}/%{name}-buildroot
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch: kde-libtool.patch
 Patch1: kdegames-3.1.1-konquest.patch
-Patch2: kdegames-3.1.4-flags.patch
-Patch3: kdegames-3.1.4-libatlantikui.patch
-
-%if %{desktop_file}
-BuildRequires:desktop-file-utils >= %{desktop_file_utils_version}
-%endif
 
 Requires: kdelibs >= 6:%{version}
 Requires: kdebase >= 6:%{version}
@@ -71,8 +61,6 @@ KDE desktop.
 %setup -q
 %patch -p1 -b .libtool
 %patch1 -p1 -b .konquest
-%patch2 -p0 -b .flags
-%patch3 -p1 -b .libatlantikui
 
 # Workaround for legacy auto* tools
 [ -x /usr/bin/autoconf-2.5? ] && ln -s /usr/bin/autoconf-2.5? autoconf
@@ -88,7 +76,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 %if %{kbattleship}
 DO_NOT_COMPILE="kbattleship"
-rm -rf rm -rf doc/kbattleship kbattleship
+rm -rf doc/kbattleship kbattleship
 %endif
 
 %if %{ktron}
@@ -104,9 +92,12 @@ FLAGS="$RPM_OPT_FLAGS -DNO_DEBUG -DNDEBUG -fno-use-cxa-atexit"
 CFLAGS="$FLAGS" \
 CXXFLAGS="$FLAGS -fno-check-new" \
 %configure \
+   --disable-rpath \
+%if %{final}
+   --enable-final \
+%endif
    --includedir=%{prefix}/include/kde \
-   --with-qt-libraries=$QTDIR/lib \
-   --enable-final
+   --with-qt-libraries=$QTDIR/lib
 
 make %{?_smp_mflags}
 
@@ -125,71 +116,6 @@ for i in *; do
 done
 popd
 
-%if %{desktop_file}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-
-desktop-file-install --vendor kde \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "Application;Game;StrategyGame;X-Red-Hat-Base" \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Games/TacticStrategy/katomic.desktop \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Games/TacticStrategy/konquest.desktop \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Games/TacticStrategy/ksokoban.desktop \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Games/Kidsgames/ktuberling.desktop
-
-desktop-file-install --vendor kde \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "Application;Game;ArcadeGame;X-Red-Hat-Base" \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Games/Arcade/kasteroids.desktop \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Games/Arcade/kbounce.desktop \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Games/Arcade/kfouleggs.desktop \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Games/Arcade/ksirtet.desktop \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Games/Arcade/ksmiletris.desktop \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Games/Arcade/kspaceduel.desktop
-
-desktop-file-install --vendor kde \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "Application;Game;BoardGame;X-Red-Hat-Base" \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Games/Board/kbackgammon.desktop \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Games/Board/kblackbox.desktop \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Games/Board/kenolaba.desktop \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Games/Board/kshisen.desktop
-
-desktop-file-install --vendor kde \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "Application;Game;CardGame;X-Red-Hat-Base" \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Games/Card/kpoker.desktop \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Games/Card/lskat.desktop
-
-for i in Arcade Board Card TacticStrategy ; do
-  case "$i" in
-    Arcade) d="ArcadeGame" ;;
-    Board) d="BoardGame" ;;
-    Card) d="CardGame" ;;
-    TacticStrategy) d="StrategyGame";;
-    *) d="$i" ;;
-  esac
-  if /bin/ls $RPM_BUILD_ROOT%{_datadir}/applnk/Games/$i/*.desktop >& /dev/null ; then
-    desktop-file-install --vendor kde \
-      --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-      --add-category "Application;Game;$d;X-Red-Hat-Base" \
-      --add-only-show-in KDE \
-      --delete-original \
-      $RPM_BUILD_ROOT%{_datadir}/applnk/Games/$i/*.desktop
-  fi
-done
-
-desktop-file-install --vendor kde \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "Application;Toys;X-Red-Hat-Base" \
-  --add-only-show-in KDE \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Toys/*.desktop
-%endif
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -201,27 +127,40 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%doc %{_docdir}/HTML/en/*
 %{_bindir}/*
-%{_libdir}/*.so*
+%{_libdir}/*.so
+%{_libdir}/*.so.??*
 %{_libdir}/*.la
 %{_libdir}/kde3/*
+%{_datadir}/applications/kde/*
 %{_datadir}/apps/*
-%{_datadir}/icons/*/*/*/*
-%{_datadir}/services/*
 %{_datadir}/config/magic/*
+%{_datadir}/config.kcfg/*
+%{_datadir}/icons/*/*/*/*
 %{_datadir}/mimelnk/application/*
-%if %{desktop_file}
-%{_datadir}/applications/*
-%else
-%{_datadir}/applnk/*
-%endif
-%doc %{_docdir}/HTML/en/*
+%{_datadir}/services/*
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/kde/*
+%{_libdir}/*.so.?
 
 %changelog
+* Mon Jan 19 2004 Than Ngo <than@redhat.com> 6:3.1.95-0.1
+- KDE 3.2 RC1
+
+* Mon Dec 01 2003 Than Ngo <than@redhat.com> 6:3.1.94-0.1
+- KDE 3.2 Beta2
+
+* Thu Nov 27 2003 Than Ngo <than@redhat.com> 6:3.1.93-0.2
+- get rid of rpath
+
+* Tue Nov 11 2003 Than Ngo <than@redhat.com> 6:3.1.93-0.1
+- KDE 3.2 Beta1
+- cleanup specfile
+- remove some patch files, which are included in new upstream
+
 * Mon Oct 13 2003 Than Ngo <than@redhat.com> 6:3.1.4-2
 - backport from CVS to fix atlantikdesigner crashed on startup
 - fix miscompiled code, (bug #106198, #106888)
diff --git a/sources b/sources
index ea3a33a..536108a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be604fb91e24f990659f5cab2ac8decf  kdegames-3.1.4.tar.bz2
+53410b3feab1c520cbf42a0bb17f5c56  kdegames-3.1.95.tar.bz2