From f0449a1c864a73f3c79506fc351973f35fa5ca35 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: Sun, 12 Sep 2010 17:25:40 +0200
Subject: [PATCH] Update to 2.25.15

---
 .gitignore         |  1 +
 mingw32-glib2.spec | 18 +++++++++++++++---
 sources            |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index ad89b96..0d1a2bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 glib-2.24.1.tar.bz2
 glib-2.25.12.tar.bz2
+/glib-2.25.15.tar.bz2
diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec
index e82a7c9..c92be3d 100644
--- a/mingw32-glib2.spec
+++ b/mingw32-glib2.spec
@@ -6,14 +6,14 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-glib2
-Version:        2.25.12
-Release:        2%{?dist}
+Version:        2.25.15
+Release:        1%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.gtk.org
-Source0:        http://download.gnome.org/sources/glib/2.23/glib-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/glib/2.25/glib-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gdb
 rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
 rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
 
+# Bash-completion files aren't interesting for mingw32
+rm -rf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/bash_completion.d
+
 %find_lang glib20
 
 
@@ -130,11 +133,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f glib20.lang
 %defattr(-,root,root,-)
+%{_mingw32_bindir}/gdbus.exe
+%{_mingw32_bindir}/glib-compile-schemas.exe
 %{_mingw32_bindir}/glib-genmarshal.exe
 %{_mingw32_bindir}/glib-gettextize
 %{_mingw32_bindir}/glib-mkenums
 %{_mingw32_bindir}/gobject-query.exe
 %{_mingw32_bindir}/gio-querymodules.exe
+%{_mingw32_bindir}/gsettings.exe
 %{_mingw32_bindir}/gspawn-win32-helper-console.exe
 %{_mingw32_bindir}/gspawn-win32-helper.exe
 %{_mingw32_bindir}/libgio-2.0-0.dll
@@ -143,6 +149,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_bindir}/libgobject-2.0-0.dll
 %{_mingw32_bindir}/libgthread-2.0-0.dll
 %{_mingw32_includedir}/glib-2.0/
+%{_mingw32_includedir}/gio-win32-2.0/
 %{_mingw32_libdir}/gio-2.0.def
 %{_mingw32_libdir}/glib-2.0.def
 %{_mingw32_libdir}/glib-2.0/
@@ -160,6 +167,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/libgthread-2.0.dll.a
 %{_mingw32_libdir}/libgthread-2.0.la
 %{_mingw32_libdir}/pkgconfig/gio-2.0.pc
+%{_mingw32_libdir}/pkgconfig/gio-windows-2.0.pc
 %{_mingw32_libdir}/pkgconfig/glib-2.0.pc
 %{_mingw32_libdir}/pkgconfig/gmodule-2.0.pc
 %{_mingw32_libdir}/pkgconfig/gmodule-export-2.0.pc
@@ -168,6 +176,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/pkgconfig/gthread-2.0.pc
 %{_mingw32_datadir}/aclocal/glib-2.0.m4
 %{_mingw32_datadir}/aclocal/glib-gettext.m4
+%{_mingw32_datadir}/aclocal/gsettings.m4
 %{_mingw32_datadir}/glib-2.0/
 
 %files static
@@ -180,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 12 2010 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.25.15-1
+- Update to 2.25.15
+
 * Wed Aug 11 2010 David Malcolm <dmalcolm@redhat.com> - 2.25.12-2
 - recompiling .py files against Python 2.7 (rhbz#623338)
 
diff --git a/sources b/sources
index 05e0616..fda57a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c709d78fb794e0ec2090cd41dfee244a  glib-2.25.12.tar.bz2
+cbcca065bd20e37b2c633725934b8b06  glib-2.25.15.tar.bz2