[mingw32-glib2: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/mingw32-glib2

[sailer]

commit 85ef65c0ae3138605c804098316e20894ec67dd9
Merge: 9008881 2e26702
Author: Thomas Sailer 
Date:   Mon Dec 6 17:56:13 2010 +0100

Merge branch 'master' of ssh://pkgs.fedoraproject.org/mingw32-glib2

Conflicts:
    	.gitignore
    	mingw32-glib2.spec
    	sources

.gitignore         |    5 +++-
 mingw32-glib2.spec |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 56 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 737cf33,517f9c0..50b4d6e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,5 +1,6 @@@
  glib-2.24.1.tar.bz2
  glib-2.25.12.tar.bz2
- /glib-2.27.4.tar.bz2
 -/glib-2.25.15.tar.bz2
 -/glib-2.25.17.tar.bz2
 -/glib-2.26.0.tar.bz2
++glib-2.27.4.tar.bz2
++glib-2.25.15.tar.bz2
++glib-2.25.17.tar.bz2
++glib-2.26.0.tar.bz2
diff --cc mingw32-glib2.spec
index d89689c,1d5ccd2..00d58ce
--- a/mingw32-glib2.spec
+++ b/mingw32-glib2.spec
@@@ -184,9 -208,28 +212,31 @@@ rm -rf $RPM_BUILD_ROO

%changelog
 +* Mon Dec  6 2010 Thomas Sailer  - 2.27.4-1
 +- update to 2.27.4
 +
+ * Sun Nov  7 2010 Erik van Pienbroek  - 2.26.0-4
+ - Fix a build failure in mingw32-libsoup and mingw32-webkitgtk
+ 
+ * Sun Oct 17 2010 Erik van Pienbroek  - 2.26.0-3
+ - Let binaries depending on GLib link against the libintl wrapper library
+   in a way that libtool doesn't refuse
+ 
+ * Sat Oct 16 2010 Erik van Pienbroek  - 2.26.0-2
+ - Rebuild in order to make libintl-8.dll a soft dependency
+ 
+ * Mon Oct 11 2010 Erik van Pienbroek  - 2.26.0-1
+ - Update to 2.26.0
+ 
+ * Thu Sep 23 2010 Erik van Pienbroek  - 2.25.17-1
+ - Update to 2.25.17
+ 
+ * Sun Sep 12 2010 Erik van Pienbroek  - 2.25.15-1
+ - Update to 2.25.15
+ 
+ * Wed Aug 11 2010 David Malcolm  - 2.25.12-2
+ - recompiling .py files against Python 2.7 (rhbz#623338)
+ 
  * Thu Aug  5 2010 Thomas Sailer  - 2.25.12-1
  - update to 2.25.12