[metacity/f15/master] Upstream git snapshot Includes Alt-` binding which we really want for gnome-shell Drop upstreamed pa

[Colin Walters]

commit ff7a1082ffb9c2072c9f8676d29b964cd7118995
Author: Colin Walters <walters at verbum.org>
Date:   Tue Mar 1 10:25:55 2011 -0500

    Upstream git snapshot
    Includes Alt-` binding which we really want for gnome-shell
    Drop upstreamed patches
    Switch to my auto-autogen snippet which automatically invokes configure,
    so we can build from a pure git archive
    Instead of using autoreconf, just rm -f configure and let autogen do
    the work

 ...cations-to-raise-windows-when-raise_on_cl.patch |   31 -----
 ...licit-raises-from-same-client-not-just-sa.patch |   73 ----------
 Dont-warn-about-a-missing-session-file.patch       |   36 -----
 ...RestartStyleHint-to-RestartIfRunning-when.patch |  140 --------------------
 libs.patch                                         |   12 --
 metacity.spec                                      |   38 +++---
 no-lame-dialog.patch                               |  133 -------------------
 title-click.patch                                  |   11 --
 8 files changed, 21 insertions(+), 453 deletions(-)
---
diff --git a/metacity.spec b/metacity.spec
index 3c66f88..3a56ded 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -2,16 +2,17 @@
 
 Summary: Unobtrusive window manager
 Name: metacity
-Version: 2.30.3
-Release: 5%{?dist}
+Version: 2.32.0
+Release: 1.git20110228%{?dist}
 URL: http://download.gnome.org/sources/metacity/
-Source0: http://download.gnome.org/sources/metacity/2.30/metacity-%{version}.tar.bz2
+# Current metacity "tarball" was generated with
+# git archive --format=tar --prefix=metacity-2.32.0-git20110228/ HEAD | bzip2
+Source0: metacity-2.32-git20110228.tar.bz2
+#Source0: http://download.gnome.org/sources/metacity/2.30/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
 Patch4: stop-spamming-xsession-errors.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=135056
 Patch5: dnd-keynav.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=588119
-Patch6: Should-set-RestartStyleHint-to-RestartIfRunning-when.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=336750
 Patch10: screenshot-forkbomb.patch
 
@@ -19,10 +20,6 @@ Patch10: screenshot-forkbomb.patch
 Patch11: workspaces.patch
 Patch12: fresh-tooltips.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=567528
-Patch14: Allow-explicit-raises-from-same-client-not-just-sa.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=445447
-Patch15: Allow-applications-to-raise-windows-when-raise_on_cl.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=598995
 Patch16: Dont-focus-ancestor-window-on-a-different-workspac.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=599097
@@ -102,16 +99,13 @@ programs using the metacity-private library, since it is a private
 API. This package exists purely for technical reasons.
 
 %prep
-%setup -q
+%setup -q -n metacity-2.32.0-git20110228
 %patch4 -p1 -b .stop-spamming-xsession-errors
 %patch5 -p1 -b .dnd-keynav
-%patch6 -p1 -b .restart-if-running
 %patch10 -p1 -b .screenshot-forkbomb
 %patch11 -p1 -b .workspaces
 %patch12 -p1 -b .fresh-tooltips
 
-%patch14 -p1 -b .raises-from-same-client
-%patch15 -p1 -b .raise-on-click-stacking
 %patch16 -p1 -b .focus-different-workspace
 %patch18 -p1 -b .focus-on-motion
 %patch19 -p1 -b .no-focus-windows
@@ -127,15 +121,16 @@ API. This package exists purely for technical reasons.
 cp -p %{SOURCE1} %{SOURCE2} src/
 
 # force regeneration
-rm src/metacity.schemas
-
-autoreconf -i -f
+rm -f src/metacity.schemas
 
 %build
 CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}"
 export CPPFLAGS
 
-%configure --disable-static
+# Always rerun configure for now
+rm -f configure
+(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
+ %configure --disable-static)
 
 SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION"
 
@@ -217,6 +212,15 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Mon Feb 28 2011 Colin Walters <walters at verbum.org> - 2.32.0-1.git20110228
+- Upstream git snapshot
+  Includes Alt-` binding which we really want for gnome-shell
+- Drop upstreamed patches
+- Switch to my auto-autogen snippet which automatically invokes configure,
+  so we can build from a pure git archive
+- Instead of using autoreconf, just rm -f configure and let autogen do
+  the work
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.30.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild