diff --git a/.cvsignore b/.cvsignore
index 5e6aeda..ce0ef4c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-wesnoth-1.0.2.tar.gz
+wesnoth-1.2.tar.gz
diff --git a/sources b/sources
index 2b9dbbc..b39eccc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d2a26062ce1c90cbf10845023f9435c  wesnoth-1.0.2.tar.gz
+722a459282abe6d04dbe228d031c088e  wesnoth-1.2.tar.gz
diff --git a/wesnoth-1.0.2-help-speedup-199079.patch b/wesnoth-1.0.2-help-speedup-199079.patch
deleted file mode 100644
index 497d494..0000000
--- a/wesnoth-1.0.2-help-speedup-199079.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nur wesnoth-1.0.2-orig/src/help.cpp wesnoth-1.0.2/src/help.cpp
---- wesnoth-1.0.2-orig/src/help.cpp	2005-09-21 02:35:50.000000000 +0200
-+++ wesnoth-1.0.2/src/help.cpp	2006-07-18 15:57:34.000000000 +0200
-@@ -2581,20 +2581,23 @@
- 
- std::string get_first_word(const std::string &s)
- {
--	if (s == "") {
-+	if ( s.empty() ) {
- 		return s;
- 	}
- 	size_t first_word_start = s.find_first_not_of(" ");
- 	if (first_word_start == std::string::npos) {
--		first_word_start = 0;
-+        return s;  // String consists of only spaces.
- 	}
- 	size_t first_word_end = s.find_first_of(" \n", first_word_start);
--	if (first_word_end == std::string::npos || first_word_end == first_word_start) {
--		// Either this word contains no spaces/newlines, or it consists
--		// of only spaces and newlines. In either case, use the whole
--		// chunk as a word.
-+	if (first_word_end == std::string::npos) {
-+		// This words ends with no spaces/newlines,
-+        // Use the whole chunk as a word.
- 		first_word_end = s.size();
- 	}
-+    else if ( first_word_end == first_word_start) {
-+        // This word is '\n'.
-+        first_word_end = first_word_start+1;
-+    }
- 	const std::string first_word = s.substr(0, first_word_end);
- 	return first_word;
- }
diff --git a/wesnoth-1.0.2-sdl_ttf.patch b/wesnoth-1.0.2-sdl_ttf.patch
deleted file mode 100644
index 077f530..0000000
--- a/wesnoth-1.0.2-sdl_ttf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nur wesnoth-1.0.2-orig/src/sdl_ttf/SDL_ttf.c wesnoth-1.0.2/src/sdl_ttf/SDL_ttf.c
---- wesnoth-1.0.2-orig/src/sdl_ttf/SDL_ttf.c	2005-09-21 02:35:47.000000000 +0200
-+++ wesnoth-1.0.2/src/sdl_ttf/SDL_ttf.c	2006-07-18 10:31:53.000000000 +0200
-@@ -48,7 +48,6 @@
- #include <freetype/ftoutln.h>
- #include <freetype/ttnameid.h>
- */
--#include <freetype/internal/ftobjs.h>
- 
- #ifndef FT_OPEN_STREAM
- #define FT_OPEN_STREAM ft_open_stream
-@@ -282,7 +281,6 @@
- 	}
- 	memset(stream, 0, sizeof(*stream));
- 
--	stream->memory = library->memory;
- 	stream->read = RWread;
- 	stream->descriptor.pointer = src;
- 	stream->pos = (unsigned long)position;
diff --git a/wesnoth.spec b/wesnoth.spec
index 2c088a3..b5691e6 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -1,16 +1,14 @@
 Name:           wesnoth
-Version:        1.0.2
-Release:        4%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.wesnoth.org
-Source0:        http://www.wesnoth.org/files/wesnoth-%{version}.tar.gz
+Source0:        http://www.%{name}.org/files/%{name}-%{version}.tar.gz
 Source1:        wesnothd.init
-Source2:        wesnoth.sysconfig
-Patch0:         wesnoth-1.0.2-sdl_ttf.patch
-Patch1:         wesnoth-1.0.2-help-speedup-199079.patch
+Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	SDL_image-devel
@@ -18,6 +16,7 @@ BuildRequires:	SDL_mixer-devel
 BuildRequires:  SDL_net-devel
 BuildRequires:	freetype-devel
 BuildRequires:  libpng-devel
+BuildRequires:	fribidi-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:	gettext
 
@@ -48,6 +47,7 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(pre): /usr/sbin/useradd
 
+
 %description server
 This package contains the binaries for running a Wesnoth server
 for multi-player games.
@@ -58,14 +58,13 @@ Summary:	%{summary}
 Group:		Amusements/Games
 Requires:	%{name} = %{version}-%{release}
 
+
 %description tools
 This package contains the game editor and development tools.
 
 
 %prep
 %setup -q
-%patch0 -p1 -b .sdl_ttf
-%patch1 -p1 -b .help-199079
 chmod -x MANUAL*
 
 
@@ -87,7 +86,7 @@ make install DESTDIR=${RPM_BUILD_ROOT}
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
                      --mode="0644" --vendor fedora \
-                     --add-category="X-Fedora" icons/%{name}.desktop
+                     icons/%{name}.desktop
 # add icon for menus
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 install -m 644 images/%{name}-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps
@@ -135,7 +134,7 @@ fi
 %files -f %{name}.\*.lang
 %defattr(-,root,root,-)
 %doc COPYING changelog README copyright MANUAL*
-%{_bindir}/wesnoth
+%{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
@@ -162,6 +161,13 @@ fi
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Sun Dec 24 2006 Brian Pepple <bpepple@fedoraproject.org> - 1.2-1
+- Update to 1.2.
+- Add BR on fribidi-devel.
+- Drop X-Fedora category from desktop file.
+- Drop help speedup patch, fixed upstream.
+- Drop ttf patch, fixed upstream.
+
 * Thu Sep  7 2006 Brian Pepple <bpepple@fedoraproject.org> - 1.0.2-4
 - Rebuild for FC6.
 - Remove unnecessary BR on SDL-devel.