- Move to git snapshot

4 files changed, 57 insertions, 17 deletions

diff --git a/.cvsignore b/.cvsignore
index 2ff4f63..fe4a48d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1 @@
-mutter-2.27.1.tar.bz2
-mutter-2.27.2.tar.bz2
-mutter-2.27.3.tar.bz2
-mutter-2.27.4.tar.bz2
-mutter-2.27.5.tar.bz2
-mutter-2.28.0.tar.bz2
+mutter-2.28.1-20100127.tar.bz2
diff --git a/mutter-fixKeySym.patch b/mutter-fixKeySym.patch
new file mode 100644
index 0000000..b3fa4e6
--- /dev/null
+++ b/mutter-fixKeySym.patch
@@ -0,0 +1,23 @@
+From e14132b8269e4b2ff1194e2d3412198e7d8168f1 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Wed, 03 Feb 2010 19:17:10 +0000
+Subject: [introspection] Include xlib.gir
+
+We need this for KeySym at least.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=607125
+---
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5f76835..a3d892d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -214,6 +214,7 @@ Meta-$(api_version).gir: $(G_IR_SCANNER) mutter $(libmutterinclude_HEADERS) $(mu
+ 		--include=Clutter-1.0			\
+ 		--pkg=clutter-1.0			\
+ 		--pkg=gtk+-2.0				\
++		--include=xlib-2.0			\
+ 		--include=xfixes-4.0			\
+ 		--program=$$pwd/mutter			\
+ 		$(filter %.c,$(mutter_SOURCES))		\
+--
+cgit v0.8.3.1
diff --git a/mutter.spec b/mutter.spec
index 28d6df2..8abb68c 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -1,13 +1,24 @@
-Name:           mutter
-Version:        2.28.0
-Release:        3%{?dist}
-Summary:        Window and compositing manager based on Clutter
-
-Group:          User Interface/Desktops
-License:        GPLv2+
-URL:            http://git.gnome.org/cgit/mutter
-Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Tarfile created using git
+# git clone git://git.gnome.org/anjal
+# git archive --format=tar --prefix=%{name}-%{version}/ %{git_version} | bzip2 > %{name}-%{version}-%{gitdate}.tar.bz2
+
+%define gitdate 20100127
+%define git_version 5764176 
+%define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
+%define snapshot %{gitdate}git%{git_version}
+
+Name:          mutter
+Version:       2.28.1
+Release:       0.1%{?dist}
+Summary:       Window and compositing manager based on Clutter
+
+Group:         User Interface/Desktops
+License:       GPLv2+
+URL:           http://git.gnome.org/cgit/mutter
+# Source0:       ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
+Source0:       %{tarfile}
+Patch0:        mutter-fixKeySym.patch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-devel
 BuildRequires: pango-devel
@@ -30,6 +41,10 @@ BuildRequires: intltool
 BuildRequires: gnome-doc-utils
 BuildRequires: desktop-file-utils
 
+#Temp while we're using git master
+BuildRequires: libtool
+BuildRequires: gnome-common
+
 Requires: control-center-filesystem
 Requires: startup-notification
 Requires: GConf2
@@ -61,6 +76,10 @@ utilities for testing Metacity/Mutter themes.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fixKeySym
+
+# run autogen.sh until we have a proper release
+NOCONFIGURE=yes ./autogen.sh
 
 %build
 %configure --with-clutter --disable-static
@@ -147,6 +166,9 @@ gconftool-2 --makefile-install-rule \
 %doc %{_mandir}/man1/mutter-window-demo.1.gz
 
 %changelog
+* Thu Feb  4 2010 Peter Robinson <pbrobinson@gmail.com> 2.28.1-0.1
+- Move to git snapshot
+
 * Wed Oct  7 2009 Owen Taylor <otaylor@redhat.com> - 2.28.0-1
 - Update to 2.28.0
 
diff --git a/sources b/sources
index 79912ef..1fcd2b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3926895782024cff7af7ca480df46b4f  mutter-2.28.0.tar.bz2
+16cd4fc93466166a55e2e7a0275a8b7f  mutter-2.28.1-20100127.tar.bz2