fix merge

clutter.spec

@@ -1,6 +1,6 @@
 Name:          clutter
-Version:       1.11.10
+Version:       1.11.12
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Open Source software library for creating rich graphical user interfaces
 
 Group:         Development/Libraries
@@ -10,7 +10,7 @@ Source0:       http://www.clutter-project.org/sources/%{name}/1.11/%{name}-%{ver
 
 BuildRequires: glib2-devel mesa-libGL-devel pkgconfig pango-devel
 BuildRequires: cairo-gobject-devel gdk-pixbuf2-devel atk-devel
-BuildRequires: cogl-devel >= 1.10.0
+BuildRequires: cogl-devel >= 1.11
 BuildRequires: gobject-introspection-devel >= 0.9.6
 BuildRequires: gtk3-devel
 BuildRequires: json-glib-devel >= 0.12.0
@@ -103,8 +103,11 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_datadir}/gtk-doc/html/cally
 
 %changelog
-* Fri Aug 17 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.11.10-2
+* Tue Aug 28 2012 Matthias Clasen <mclasen@redhat.com> - 1.11.12-3
-- Rebuild for new cogl
+- Rebuild against new cogl
+
+* Tue Aug 21 2012 Richard Hughes <hughsient@gmail.com> - 1.11.12-1
+- Update to 1.11.12
 
 * Tue Aug  7 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.11.10-1
 - Update to 1.11.10

sources

@@ -1 +1 @@
-7e58b81caf3bc0dba0a069cd027f27d3  clutter-1.11.10.tar.xz
+0c49cbe2cdc205d099a8144512fcf875  clutter-1.11.12.tar.xz