[glib2/f15/master] 2.28.5

[Matthias Clasen]

commit f0d45d4873ce744eadbded21b2e54817fd48a378
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Fri Apr 1 18:26:59 2011 -0400

    2.28.5

 .gitignore |    1 +
 glib2.spec |    8 ++++----
 sources    |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bcdb7ce..35e9fa7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ glib-2.25.13.tar.bz2
 /glib-2.28.2.tar.bz2
 /glib-2.28.3.tar.bz2
 /glib-2.28.4.tar.bz2
+/glib-2.28.5.tar.bz2
diff --git a/glib2.spec b/glib2.spec
index 323f9a1..868a7df 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.28.4
+Version: 2.28.5
 Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -12,8 +12,6 @@ Source: http://download.gnome.org/sources/glib/2.28/glib-%{version}.tar.bz2
 Source2: glib2.sh
 Source3: glib2.csh
 
-# upstream fix
-Patch0: 0001-introspection-add-annotations-for-g_file_load_conten.patch
 BuildRequires: pkgconfig
 BuildRequires: gamin-devel
 BuildRequires: gettext
@@ -59,7 +57,6 @@ The glib2-static package includes static libraries of the GLib library.
 
 %prep
 %setup -q -n glib-%{version}
-%patch0 -p1 -b .annotations
 
 %build
 # Support builds of both git snapshots and tarballs packed with autogoo
@@ -163,6 +160,9 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
 
 
 %changelog
+* Fri Apr  1 2011 Matthias Clasen <mclasen at redhat.com> - 2.28.5-1
+- Update to 2.28.5
+
 * Tue Mar 29 2011 Matthias Clasen <mclasen at redhat.com> - 2.28.4-2
 - Fix some introspection annotations
 
diff --git a/sources b/sources
index 2c6d37c..bc56187 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-154df457100452ea1ce2b1e493ee2dad  glib-2.28.4.tar.bz2
+ddf80a060ec9039ad40452ba3ca2311b  glib-2.28.5.tar.bz2