Merge remote-tracking branch 'origin/f18'

2012-09-18 14:09:24 +02:00 · 2012-09-18 14:09:24 +02:00 · 5a0b40f8b4
commit 5a0b40f8b4
parent ae10613eeb b78b94d66b
2 changed files with 10 additions and 4 deletions
--- a/glib2.spec
+++ b/glib2.spec
@ -1,7 +1,7 @@
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.33.6
-Release: 4%{?dist}
+Version: 2.33.12
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@ -151,9 +151,15 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
 %{_datadir}/systemtap/tapset/*.stp

 %changelog
-* Wed Sep 12 2012 Lennart Poettering <lpoetter@redhat.com> - 2.33.6-4
+* Wed Sep 12 2012 Lennart Poettering <lpoetter@redhat.com> - 2.33.12-2
 - Drop explicit dependency on eject, as it is included in util-linux now, which is available in the base set

+* Tue Sep 04 2012 Richard Hughes <hughsient@gmail.com> - 2.33.12-1
+- Update to 2.33.12
+
+* Tue Aug 21 2012 Richard Hughes <hughsient@gmail.com> - 2.33.10-1
+- Update to 2.33.10
+
 * Mon Aug 13 2012 Colin Walters <walters@verbum.org> - 2.33.6-3
 - Re-add code to strip RPATHs (#840414)

--- a/2
+++ b/2
@ -1 +1 @@
-bf43ebc65042e1b426c5005adb33d998  glib-2.33.6.tar.xz
+9073f6c032384491223ecae9545da4fe  glib-2.33.12.tar.xz