From aec6fe807a3fdfd24cecb1c1e303a0130ee984d1 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Wed, 25 May 2011 16:13:37 -0400 Subject: [PATCH] Update to 3.0.2.1 --- .gitignore | 1 + libmutter-session-save.patch | 51 ------------------------------------ mutter.spec | 11 ++++---- sources | 2 +- 4 files changed, 7 insertions(+), 58 deletions(-) delete mode 100644 libmutter-session-save.patch diff --git a/.gitignore b/.gitignore index e6f4957..57a986f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ mutter-2.31.5.tar.bz2 /mutter-2.91.93.tar.bz2 /mutter-3.0.0.tar.bz2 /mutter-3.0.1.tar.bz2 +/mutter-3.0.2.1.tar.bz2 diff --git a/libmutter-session-save.patch b/libmutter-session-save.patch deleted file mode 100644 index 82d2aef..0000000 --- a/libmutter-session-save.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -up mutter-3.0.1/src/core/session.c.save mutter-3.0.1/src/core/session.c ---- mutter-3.0.1/src/core/session.c.save 2011-04-27 21:44:14.349244352 -0400 -+++ mutter-3.0.1/src/core/session.c 2011-04-27 21:52:28.558065891 -0400 -@@ -308,13 +308,16 @@ meta_session_init (const char *previous_ - */ - char hint = SmRestartIfRunning; - char priority = 20; /* low to run before other apps */ -- -+ char *prgname; -+ -+ prgname = g_get_prgname (); -+ - prop1.name = SmProgram; - prop1.type = SmARRAY8; - prop1.num_vals = 1; - prop1.vals = &prop1val; -- prop1val.value = "mutter"; -- prop1val.length = strlen ("mutter"); -+ prop1val.value = prgname; -+ prop1val.length = strlen (prgname); - - /* twm sets getuid() for this, but the SM spec plainly - * says pw_name, twm is on crack -@@ -573,6 +576,9 @@ set_clone_restart_commands (void) - char *discardv[10]; - int i; - SmProp prop1, prop2, prop3, *props[3]; -+ char *prgname; -+ -+ prgname = g_get_prgname (); - - /* Restart (use same client ID) */ - -@@ -582,7 +588,7 @@ set_clone_restart_commands (void) - g_return_if_fail (client_id); - - i = 0; -- restartv[i] = "mutter"; -+ restartv[i] = prgname; - ++i; - restartv[i] = "--sm-client-id"; - ++i; -@@ -603,7 +609,7 @@ set_clone_restart_commands (void) - /* Clone (no client ID) */ - - i = 0; -- clonev[i] = "mutter"; -+ clonev[i] = prgname; - ++i; - clonev[i] = NULL; - diff --git a/mutter.spec b/mutter.spec index d748bc0..0d17ed8 100644 --- a/mutter.spec +++ b/mutter.spec @@ -1,6 +1,6 @@ Name: mutter -Version: 3.0.1 -Release: 3%{?dist} +Version: 3.0.2.1 +Release: 1%{?dist} Summary: Window and compositing manager based on Clutter Group: User Interface/Desktops @@ -8,9 +8,6 @@ License: GPLv2+ #VCS: git:git://git.gnome.org/mutter Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.0/%{name}-%{version}.tar.bz2 -# upstream fix -Patch0: libmutter-session-save.patch - BuildRequires: clutter-devel >= 1.5.8 BuildRequires: pango-devel BuildRequires: startup-notification-devel @@ -63,7 +60,6 @@ utilities for testing Metacity/Mutter themes. %prep %setup -q -%patch0 -p1 -b .session-save %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi; @@ -147,6 +143,9 @@ gconftool-2 --makefile-install-rule \ %doc %{_mandir}/man1/mutter-window-demo.1.gz %changelog +* Wed May 25 2011 Owen Taylor - 3.0.2.1-1 +- Update to 3.0.2.1 + * Fri Apr 29 2011 Matthias Clasen - 3.0.1-3 - Actually apply the patch for #700276 diff --git a/sources b/sources index a2e98d3..ec05139 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b0becf3994d279dae28a898d0e74d018 mutter-3.0.1.tar.bz2 +52212e032309fff6307f9083171fcb1a mutter-3.0.2.1.tar.bz2