[clutter/f13/master: 19/19] 1.2.14

[Peter Robinson]

commit 9ea27223258291e8b2c00f314574c0a4294740be
Merge: 7afd68f 9d37f66
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Sep 24 21:39:17 2010 +0100

    1.2.14

 .gitignore   |    2 +-
 clutter.spec |   35 +++++++++++++++++++++++++++++++----
 sources      |    2 +-
 3 files changed, 33 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index e6b8c96,460beb2..1699ebd
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--clutter-1.2.10.tar.bz2
 -/clutter-1.2.14.tar.bz2
++clutter-1.2.14.tar.bz2
diff --cc clutter.spec
index 85a6370,0a91b2e..785e4c0
--- a/clutter.spec
+++ b/clutter.spec
@@@ -14,16 -13,14 +14,15 @@@ BuildRoot:      %{_tmppath}/%{name}-%{v
  Patch0:         Use-a-native-format-for-atlas-textures.patch
  
  BuildRequires:  glib2-devel mesa-libGL-devel gtk2-devel pkgconfig pango-devel
 -BuildRequires:  gobject-introspection-devel >= 0.6.4
 +BuildRequires:  gobject-introspection-devel
 +BuildRequires:  gir-repository-devel
  BuildRequires:  json-glib-devel
  BuildRequires:  libXdamage-devel gettext gtk-doc
 -# Bootstrap requirements
 -BuildRequires:  gtk-doc
 -BuildRequires:  automake autoconf libtool
 +
 +Requires:       gobject-introspection
 +Requires:       gir-repository
  
- Obsoletes: clutter-cairo < 0.9
- Provides:  clutter-cairo = 0.9
+ Requires:       gobject-introspection
  
  %description
  Clutter is an open source software library for creating fast,