Merge branch 'master' into f16

Conflicts:
	libpeas.spec

.gitignore

@@ -4,3 +4,4 @@
 /libpeas-1.0.0.tar.bz2
 /libpeas-1.1.0.tar.xz
 /libpeas-1.1.1.tar.xz
+/libpeas-1.1.2.tar.xz

libpeas.spec

@@ -1,6 +1,6 @@
 Name:		libpeas
-Version:	1.1.1
-Release:	3%{?dist}
+Version:	1.1.2
+Release:	1%{?dist}
 Summary:	Plug-ins implementation convenience library
 
 Group:		System Environment/Libraries
@@ -9,7 +9,7 @@ URL:		http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/
 Source0:	http://ftp.acc.umu.se/pub/GNOME/sources/%{name}/1.1/%{name}-%{version}.tar.xz
 
 BuildRequires:	gtk3-devel >= 2.99.3
-BuildRequires:	pygobject2-devel
+BuildRequires:	pygobject3-devel
 BuildRequires:	python-devel
 BuildRequires:	intltool
 BuildRequires:	libtool
@@ -105,6 +105,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_datadir}/glade/catalogs/libpeas-gtk.xml
 
 %changelog
+* Tue Aug 23 2011 Adam Williamson <awilliam@redhat.com> - 1.1.2-1
+- Update to 1.1.2
+- bump BR to pygobject3-devel
+
 * Wed Aug 03 2011 Bastien Nocera <bnocera@redhat.com> 1.1.1-3
 - Another attempt at building against the latest gjs
 

sources

@@ -1 +1 @@
-5b2eb8bd9c02741f25a34698e556f2f6  libpeas-1.1.1.tar.xz
+26a567dc24de20bd21132344445ef506  libpeas-1.1.2.tar.xz