Merge branch 'f17'

3 files changed, 13 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index 3c91809..9065704 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,5 @@ mutter-2.31.5.tar.bz2
 /mutter-3.3.2.tar.xz
 /mutter-3.3.3.tar.xz
 /mutter-3.3.4.tar.xz
+/mutter-3.3.5.tar.xz
+/mutter-3.3.90.tar.xz
diff --git a/mutter.spec b/mutter.spec
index 926b359..5fb91e2 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -1,5 +1,5 @@
 Name:          mutter
-Version:       3.3.4
+Version:       3.3.90
 Release:       2%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
@@ -64,7 +64,7 @@ utilities for testing Metacity/Mutter themes.
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
  %configure --disable-static --with-gtk=3.0 --enable-compile-warnings=maximum)
 
-SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION HAVE_COMPOSITE_EXTENSION"
+SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION"
 
 for I in $SHOULD_HAVE_DEFINED; do
   if ! grep -q "define $I" config.h; then
@@ -127,8 +127,14 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %doc %{_mandir}/man1/mutter-window-demo.1.gz
 
 %changelog
-* Wed Mar 14 2012 Brian Pepple <bpepple@fedoraproject.org> - 3.3.4-2
-- Rebuild for new cogl
+* Sat Mar 10 2012 Matthias Clasen <mclasen@redhat.com> - 3.3.90-2
+- Rebuild against new cogl
+
+* Sat Feb 25 2012 Matthias Clasen <mclasen@redhat.com> - 3.3.90-1
+- Update to 3.3.90
+
+* Tue Feb  7 2012 Matthias Clasen <mclasen@redhat.com> - 3.3.5-1
+- Update to 3.3.5
 
 * Fri Jan 20 2012 Matthias Clasen <mclasen@redhat.com> - 3.3.4-1
 - Update to 3.3.4
diff --git a/sources b/sources
index 9d1c320..5b3bd47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-733baae9faeed11ad19ca0b4bacfedd4  mutter-3.3.4.tar.xz
+76cff8f1a1f22125466a69fedbbf8a94  mutter-3.3.90.tar.xz