From 46c3a7765b3b6aa37532b4df2075221b941a3da7 Mon Sep 17 00:00:00 2001
From: epienbro <epienbro@fedoraproject.org>
Date: Mon, 6 Jul 2009 18:06:51 +0000
Subject: [PATCH] - Update to 2.21.3 - Drop upstreamed patch

---
 .cvsignore                               |  2 +-
 glib2-mingw-uih-header-compile-fix.patch | 37 ------------------------
 mingw32-glib2.spec                       | 12 ++++----
 sources                                  |  2 +-
 4 files changed, 8 insertions(+), 45 deletions(-)
 delete mode 100644 glib2-mingw-uih-header-compile-fix.patch

diff --git a/.cvsignore b/.cvsignore
index 40d1d80..d13b1fb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-glib-2.21.2.tar.bz2
+glib-2.21.3.tar.bz2
diff --git a/glib2-mingw-uih-header-compile-fix.patch b/glib2-mingw-uih-header-compile-fix.patch
deleted file mode 100644
index b24090f..0000000
--- a/glib2-mingw-uih-header-compile-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 854a43a3cd5cb8cc97b66d6f8f661e2a7096acda Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sat, 20 Jun 2009 03:18:09 +0000
-Subject: Fix build on mingw
-
-Mingw does not have sys/uio.h. This was reported in bug 585937.
-
-Author:    Matthias Clasen <mclasen@redhat.com>
----
-diff --git a/configure.in b/configure.in
-index de0d399..d253f60 100644
---- a/configure.in
-+++ b/configure.in
-@@ -857,6 +857,7 @@ AC_CHECK_HEADERS([sys/time.h sys/times.h sys/wait.h unistd.h values.h])
- AC_CHECK_HEADERS([sys/select.h sys/types.h stdint.h sched.h malloc.h])
- AC_CHECK_HEADERS([sys/vfs.h sys/mount.h sys/vmount.h sys/statfs.h sys/statvfs.h])
- AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h sys/sysctl.h fstab.h])
-+AC_CHECK_HEADERS([sys/uio.h])
- 
- # check for structure fields
- AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec])
-diff --git a/gio/gsocket.c b/gio/gsocket.c
-index 0670ee4..151adb5 100644
---- a/gio/gsocket.c
-+++ b/gio/gsocket.c
-@@ -38,7 +38,9 @@
- # include <unistd.h>
- #endif
- 
-+#ifdef HAVE_SYS_UIO_H
- #include <sys/uio.h>
-+#endif
- 
- #include "gsocket.h"
- #include "gcancellable.h"
---
-cgit v0.8.2
diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec
index e78c8d7..36db877 100644
--- a/mingw32-glib2.spec
+++ b/mingw32-glib2.spec
@@ -6,8 +6,8 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-glib2
-Version:        2.21.2
-Release:        2%{?dist}
+Version:        2.21.3
+Release:        1%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
@@ -16,9 +16,6 @@ URL:            http://www.gtk.org
 Source0:        http://download.gnome.org/sources/glib/2.21/glib-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Git commit 854a43a3cd5cb8cc97b66d6f8f661e2a7096acda
-Patch0:         glib2-mingw-uih-header-compile-fix.patch
-
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 52
@@ -54,7 +51,6 @@ Static version of the MinGW Windows GLib2 library.
 
 %prep
 %setup -q -n glib-%{version}
-%patch0 -p1
 
 
 %build
@@ -180,6 +176,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul  6 2009 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.21.3-1
+- Update to 2.21.3
+- Drop upstreamed patch
+
 * Mon Jun 22 2009 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.21.2-2
 - The wrong RPM variable was overriden for -debuginfo support. Should be okay now
 
diff --git a/sources b/sources
index 370cd91..96e3d54 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2dcb938db904efcc62757b3b0655593b  glib-2.21.2.tar.bz2
+8ed8d959a131e295ce75c8ebe867014e  glib-2.21.3.tar.bz2