From 8aae942f9f3e1ff897843a6bc049ae6959522eba Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Sep 16 2007 21:14:18 +0000
Subject: 2.20.0


---

diff --git a/.cvsignore b/.cvsignore
index 0d37280..985bbb3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-metacity-2.19.55.tar.bz2
+metacity-2.20.0.tar.bz2
diff --git a/metacity.spec b/metacity.spec
index 207c485..337e10c 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -1,18 +1,16 @@
 %define gettext_package metacity
 
-%define metacity_version 2.19.55
+%define metacity_version 2.20.0
 
 %define metacity_filename metacity-%{metacity_version}
 
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 4%{?dist}
+Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
-Source0: http://download.gnome.org/sources/metacity/2.19/%{metacity_filename}.tar.bz2
+Source0: http://download.gnome.org/sources/metacity/2.20/%{metacity_filename}.tar.bz2
 Patch0: default-theme.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=433253
-Patch1: metacity-2.18.5-dont-deref-null-pointer.patch
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,7 +64,6 @@ API. This package exists purely for technical reasons.
 %prep
 %setup -q -n %{metacity_filename}
 %patch0 -p1 -b .default-theme
-%patch1 -p1 -b .dont-deref-null-pointer
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -153,6 +150,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep 11 2007 Ray Strode <rstrode@redhat.com> - 2.19.55-4
 - fix crash on logout (and on the subsequent login, bug 243761)
 
diff --git a/sources b/sources
index 266a068..0e92896 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d9b30f8c7aff29777f28196957a1b46  metacity-2.19.55.tar.bz2
+e9c6317c85db019ac2d832dd9f45f536  metacity-2.20.0.tar.bz2