diff --git a/gnome-terminal-2.21.92.tar.bz2 b/gnome-terminal-2.21.92.tar.bz2
deleted file mode 100644
index b7f6867..0000000
--- a/gnome-terminal-2.21.92.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3675a4b7269bcba3fbfd485eaead82b14885ddb265d6cba111934d581586a191
-size 1805437
diff --git a/gnome-terminal-2.22.0.tar.bz2 b/gnome-terminal-2.22.0.tar.bz2
new file mode 100644
index 0000000..eecb631
--- /dev/null
+++ b/gnome-terminal-2.22.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f157938dbfe0babe8545bcdb7b1fa51403bbf17904d56f3242a528d55190b56e
+size 1819541
diff --git a/gnome-terminal-defaults.patch b/gnome-terminal-defaults.patch
deleted file mode 100644
index 1814de3..0000000
--- a/gnome-terminal-defaults.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: gnome-terminal-2.21.91.1/src/gnome-terminal.schemas.in
-===================================================================
---- gnome-terminal-2.21.91.1.orig/src/gnome-terminal.schemas.in
-+++ gnome-terminal-2.21.91.1/src/gnome-terminal.schemas.in
-@@ -44,7 +44,7 @@
- /apps/gnome-terminal/global/use_mnemonics
- gnome-terminal
- bool
-- true
-+ false
-
- Whether the menubar has access keys
-
-@@ -60,7 +60,7 @@
- /apps/gnome-terminal/global/use_menu_accelerators
- gnome-terminal
- bool
-- true
-+ false
-
- Whether the standard GTK shortcut for menubar access is enabled
-
-@@ -604,8 +604,7 @@
- Whether to use the system font
-
- If true, the terminal will use the desktop-global standard
-- font if it's monospace (and the most similar font it can
-- come up with otherwise).
-+ terminal font.
-
-
-
diff --git a/gnome-terminal.changes b/gnome-terminal.changes
index 79f5040..866892c 100644
--- a/gnome-terminal.changes
+++ b/gnome-terminal.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Mar 13 18:17:12 CET 2008 - sbrabec@suse.cz
+
+- Custom look'n'feel gconf keys moved to gconf2-branding-openSUSE.
+
+-------------------------------------------------------------------
+Thu Mar 13 16:11:09 CET 2008 - vuntz@suse.de
+
+- Update to version 2.22.0:
+ + Updated translations.
+
-------------------------------------------------------------------
Wed Mar 5 00:54:01 CET 2008 - maw@suse.de
diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 40351f0..3ba81d8 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -1,5 +1,5 @@
#
-# spec file for package gnome-terminal (Version 2.21.92)
+# spec file for package gnome-terminal (Version 2.22.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,14 +16,13 @@ BuildRequires: docbook_4 fdupes gnome-common gnome-doc-utils-devel gnutls-devel
License: GPL v2 or later; LGPL v2.1 or later
Group: System/X11/Terminals
Obsoletes: gnome-core
-Version: 2.21.92
+Version: 2.22.0
Release: 1
Summary: The GNOME 2.x Desktop Terminal
Source: %{name}-%{version}.tar.bz2
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: filesystem gconf2
-Patch1: gnome-terminal-defaults.patch
# PATCH-NEEDS-REBASE gnome-terminal-force-terminal-draw.patch
Patch2: gnome-terminal-force-terminal-draw.patch
Patch4: gnome-terminal-desktop.patch
@@ -42,7 +41,6 @@ handy for quick tasks on the command line.
%lang_package
%prep
%setup -q
-%patch1 -p1
#%patch2 -p1
%patch4 -p1
#%patch5
@@ -92,6 +90,11 @@ rm -rf $RPM_BUILD_ROOT
%files lang -f %{name}.lang
%changelog
+* Thu Mar 13 2008 sbrabec@suse.cz
+- Custom look'n'feel gconf keys moved to gconf2-branding-openSUSE.
+* Thu Mar 13 2008 vuntz@suse.de
+- Update to version 2.22.0:
+ + Updated translations.
* Wed Mar 05 2008 maw@suse.de
- Update to version 2.21.92:
+ Ensure menu items are always drawn