[mingw-glib2/f17] Update to 2.32.4

[Kalev Lember]

commit 666b537fae22c47e4b5b73f8eeb180827614a314
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sun Jul 15 23:37:26 2012 +0300

    Update to 2.32.4

 0001-win32-fix-build-after-bug-674452.patch |   25 +++++++++++++++++++++++++
 mingw-glib2.spec                            |   15 +++++++++++----
 sources                                     |    2 +-
 3 files changed, 37 insertions(+), 5 deletions(-)
---
diff --git a/0001-win32-fix-build-after-bug-674452.patch b/0001-win32-fix-build-after-bug-674452.patch
new file mode 100644
index 0000000..dc35820
--- /dev/null
+++ b/0001-win32-fix-build-after-bug-674452.patch
@@ -0,0 +1,25 @@
+From af3b1674cd65e1d650fb82bc93483391b99feb50 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau at gmail.com>
+Date: Tue, 3 Jul 2012 20:04:05 +0200
+Subject: [PATCH] win32: fix build after bug 674452
+
+---
+ gio/gcontenttype.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c
+index dc48411..b91835e 100644
+--- a/gio/gcontenttype.c
++++ b/gio/gcontenttype.c
+@@ -332,7 +332,7 @@ g_content_type_guess (const gchar  *filename,
+ 
+   /* our test suite and potentially other code used -1 in the past, which is
+    * not documented and not allowed; guard against that */
+-  g_return_val_if_fail (data_size != (gsize) -1, g_strdup (XDG_MIME_TYPE_UNKNOWN));
++  g_return_val_if_fail (data_size != (gsize) -1, g_strdup ("*"));
+ 
+   if (filename)
+     {
+-- 
+1.7.10.4
+
diff --git a/mingw-glib2.spec b/mingw-glib2.spec
index ee2b5fb..06cb2f5 100644
--- a/mingw-glib2.spec
+++ b/mingw-glib2.spec
@@ -1,8 +1,8 @@
 %?mingw_package_header
 
 Name:           mingw-glib2
-Version:        2.32.2
-Release:        2%{?dist}
+Version:        2.32.4
+Release:        1%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
@@ -37,6 +37,8 @@ BuildRequires:  glib2-devel >= 2.31.20
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=675516
 Patch0:         0001-Don-t-start-a-DBus-server-when-built-as-static-lib.patch
+# Backported build fix from git master
+Patch1:         0001-win32-fix-build-after-bug-674452.patch
 
 
 %description
@@ -79,6 +81,7 @@ Static version of the MinGW Windows GLib2 library.
 %prep
 %setup -q -n glib-%{version}
 %patch0 -p1
+%patch1 -p1 -b .content_type
 
 
 %build
@@ -137,8 +140,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}
 rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
 
 # Bash-completion files aren't interesting for mingw
-rm -rf $RPM_BUILD_ROOT%{mingw32_sysconfdir}/bash_completion.d
-rm -rf $RPM_BUILD_ROOT%{mingw64_sysconfdir}/bash_completion.d
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/bash-completion
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/bash-completion
 
 # The .def files are also of no use to other binaries
 rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.def
@@ -257,6 +260,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %changelog
+* Sun Jul 15 2012 Kalev Lember <kalevlember at gmail.com> - 2.32.4-1
+- Update to 2.32.4
+- Backport a build fix from from git master
+
 * Sat May 05 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.32.2-2
 - Fix compile failure while building static library (GNOME BZ #675516)
 
diff --git a/sources b/sources
index 7f05da0..6c6a0fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5bfdb6197afb90e4dbc7b1bb98f0eae0  glib-2.32.2.tar.xz
+bf84fefd9c1a5b5a7a38736f4ddd674a  glib-2.32.4.tar.xz