[ember] Remove some work arounds added for 0.6.1.1

[Bruno Wolff III]

commit ee1df0a1ddd992d3d2897b97f7b417c60b6186fe
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sat Nov 19 10:17:07 2011 -0600

    Remove some work arounds added for 0.6.1.1

 ember.spec |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/ember.spec b/ember.spec
index 39b843a..4fed46f 100644
--- a/ember.spec
+++ b/ember.spec
@@ -18,9 +18,7 @@ BuildRequires:  eris-devel >= 1.3.16
 BuildRequires:  mercator-devel varconf-devel wfmath-devel libwfut-devel
 BuildRequires:  desktop-file-utils
 
-# Temporarily have ember and ember-media use different versions
-#Requires:       %{name}-media = %{version}
-Requires:       %{name}-media = 0.6.1
+Requires:       %{name}-media = %{version}
 
 %description
 Ember is a client for MMORPGs using the WorldForge system.
@@ -28,8 +26,7 @@ It uses the Ogre 3D engine with CEGUI.
 
 
 %prep
-# The version name in the tar extract didn't change with 0.6.1.1
-%setup -q -n ember-0.6.1
+%setup -q
 %patch1 -p1
 %patch2
 
@@ -59,9 +56,6 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/worldforge/ember.png \
 rm -f $RPM_BUILD_ROOT%{_datadir}/ember/media/shared/modeldefinitions/{drystan_archer,vehicles,outdoor_structures,buildings,fencegate,palissade,house_A,choppingblockA,choppingblockB,mushroom,male,humanoid}.modeldef
 rm -f $RPM_BUILD_ROOT%{_datadir}/ember/media/shared/common/resources/ogre/scripts/materials/smoke.material
 
-# Temporary fix for 0.6.1.1 putting doc files in 0.6.1 directory.
-rm -rf $RPM_BUILD_ROOT%{_docdir}/ember-0.6.1
-
 %check
 make check