Merge branch 'f15'

Conflicts:
	.gitignore
	libpeas.spec
	sources

.gitignore

@@ -1,6 +1,4 @@
-libpeas-0.5.3.tar.bz2
-libpeas-0.5.4.tar.bz2
-/libpeas-0.5.5.tar.bz2
-/libpeas-0.7.0.tar.bz2
-/libpeas-0.7.1.tar.bz2
-/libpeas-0.7.2.tar.bz2
+/libpeas-0.7.3.tar.bz2
+/libpeas-0.7.4.tar.bz2
+/libpeas-0.9.0.tar.bz2
+/libpeas-1.0.0.tar.bz2

libpeas.spec

@@ -1,12 +1,12 @@
 Name:		libpeas
-Version:	0.7.2
+Version:	1.0.0
 Release:	1%{?dist}
 Summary:	Plug-ins implementation convenience library
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/
-Source0:	http://ftp.acc.umu.se/pub/GNOME/sources/%{name}/0.7/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.acc.umu.se/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}.tar.bz2
 
 BuildRequires:	gtk3-devel >= 2.99.3
 BuildRequires:	pygobject2-devel
@@ -17,9 +17,6 @@ BuildRequires:	libtool
 # For the girepository-1.0 directory
 Requires:	gobject-introspection
 
-Requires(post):   /usr/bin/gtk-update-icon-cache
-Requires(postun): /usr/bin/gtk-update-icon-cache
-
 %description
 libpeas is a convenience library making adding plug-ins support
 to GTK+ and glib-based applications.
@@ -93,6 +90,19 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Apr  4 2011 Christopher Aillon <caillon@redhat.com> 1.0.0-1
+- Update to 1.0.0
+
+* Sun Mar 27 2011 Bastien Nocera <bnocera@redhat.com> 0.9.0-1
+- Update to 0.9.0
+
+* Thu Mar 10 2011 Bastien Nocera <bnocera@redhat.com> 0.7.4-1
+- Update to 0.7.4
+
+* Tue Feb 22 2011 Matthias Clasen <mclasen@redhat.com> 0.7.3-1
+- Update to 0.7.3
+- Drop unneeded dependencies
+
 * Mon Feb 21 2011 Bastien Nocera <bnocera@redhat.com> 0.7.2-1
 - Update to 0.7.2
 

sources

@@ -1 +1 @@
-dd183991ad53fe9d0bba31b160477308  libpeas-0.7.2.tar.bz2
+d716358eec12d4439d04c337733f1f60  libpeas-1.0.0.tar.bz2