diff options
-rw-r--r-- | .cvsignore | 2 | ||||
-rw-r--r-- | metacity.spec | 8 | ||||
-rw-r--r-- | single-workspace-crash.patch | 19 | ||||
-rw-r--r-- | sources | 2 |
4 files changed, 6 insertions, 25 deletions
@@ -1 +1 @@ -metacity-2.21.2.tar.bz2 +metacity-2.21.3.tar.bz2 diff --git a/metacity.spec b/metacity.spec index 0722a31..d76bcbe 100644 --- a/metacity.spec +++ b/metacity.spec @@ -1,6 +1,6 @@ %define gettext_package metacity -%define metacity_version 2.21.2 +%define metacity_version 2.21.3 %define metacity_filename metacity-%{metacity_version} @@ -13,8 +13,6 @@ Source0: http://download.gnome.org/sources/metacity/2.21/%{metacity_filename}.ta Patch0: default-theme.patch # http://bugzilla.gnome.org/show_bug.cgi?id=482354 Patch1: metacity-firefox-workaround-2.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=496054 -Patch2: single-workspace-crash.patch License: GPLv2+ Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,7 +67,6 @@ API. This package exists purely for technical reasons. %setup -q -n %{metacity_filename} %patch0 -p1 -b .default-theme %patch1 -p0 -b .firefox-workaround -%patch2 -p1 -b .single-workspace-crash %build rm -rf $RPM_BUILD_ROOT @@ -156,6 +153,9 @@ fi %{_mandir}/man1/metacity-window-demo.1.gz %changelog +* Sun Dec 16 2007 Matthias Clasen <mclasen@redhat.com> - 2.21.3-1 +- Update to 2.21.3 + * Sun Nov 18 2007 Matthias Clasen <mclasen@redhat.com> - 2.21.2-1 - Update to 2.21.2 diff --git a/single-workspace-crash.patch b/single-workspace-crash.patch deleted file mode 100644 index 1dbe176..0000000 --- a/single-workspace-crash.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up metacity-2.20.0/src/menu.c.single-workspace-crash metacity-2.20.0/src/menu.c ---- metacity-2.20.0/src/menu.c.single-workspace-crash 2007-11-11 23:41:43.000000000 -0500 -+++ metacity-2.20.0/src/menu.c 2007-11-11 23:41:52.000000000 -0500 -@@ -474,10 +474,12 @@ meta_window_menu_new (MetaFrames - g_free, FALSE, FALSE); - } - -- -- gtk_menu_shell_append (GTK_MENU_SHELL (menu->menu), mi); -+ if (mi) -+ { -+ gtk_menu_shell_append (GTK_MENU_SHELL (menu->menu), mi); - -- gtk_widget_show (mi); -+ gtk_widget_show (mi); -+ } - } - } - @@ -1 +1 @@ -0579a8b5df6faeb647607086d0d8dc09 metacity-2.21.2.tar.bz2 +a449311b27342281af32cb1fc8d3e685 metacity-2.21.3.tar.bz2 |