Hello community, here is the log from the commit of package glib2 checked in at Fri May 16 21:56:04 CEST 2008. -------- --- GNOME/glib2/glib2.changes 2008-05-06 14:38:46.000000000 +0200 +++ glib2/glib2.changes 2008-05-14 01:45:57.007464000 +0200 @@ -1,0 +2,15 @@ +Wed May 14 01:50:37 CEST 2008 - hpj@suse.de + +- Add glib2-bnc379739-handle-blank-tryexec.patch (bnc#379739). + +------------------------------------------------------------------- +Mon May 12 18:14:21 CEST 2008 - maw@suse.de + +- Add glib2-base64.patch (bnc#382708). + +------------------------------------------------------------------- +Sun May 11 11:50:18 CEST 2008 - coolo@suse.de + +- fix rename of xxbit packages + +------------------------------------------------------------------- New: ---- glib2-base64.patch glib2-bnc379739-handle-blank-tryexec.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2.spec ++++++ --- /var/tmp/diff_new_pack.Vn4108/_old 2008-05-16 21:51:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Vn4108/_new 2008-05-16 21:51:54.000000000 +0200 @@ -18,7 +18,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: 2.16.3 -Release: 12 +Release: 15 Summary: A Library with Convenient Functions Written in C Url: http://www.gtk.org/ Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar.bz2 @@ -46,6 +46,10 @@ Patch7: glib2-fix-bookmark-leak.diff # PATCH-FIX-OPENSUSE glib2-bnc379332-desktop-su.patch bnc379332 vuntz@novell.com -- Use X-KDE-SubstituteUID Patch8: glib2-bnc379332-desktop-su.patch +# PATCH-FIX-UPSTREAM glib2-base64.patch pchenthill@novell.com bnc382708 +Patch9: glib2-base64.patch +# PATCH-FIX-UPSTREAM glib2-bnc379739-handle-blank-tryexec.patch bnc379739 hpj@novell.com +Patch10: glib2-bnc379739-handle-blank-tryexec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} # For temporary %%pre script only. @@ -375,6 +379,8 @@ %patch6 %patch7 -p1 %patch8 +%patch9 +%patch10 -p1 cp -a %{S:1} %{S:2} %{S:3} . cp -a %{S:4} gnome_defaults.conf if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then @@ -505,6 +511,12 @@ %dir %{_datadir}/gtk-doc/html %changelog +* Wed May 14 2008 hpj@suse.de +- Add glib2-bnc379739-handle-blank-tryexec.patch (bnc#379739). +* Mon May 12 2008 maw@suse.de +- Add glib2-base64.patch (bnc#382708). +* Sun May 11 2008 coolo@suse.de +- fix rename of xxbit packages * Tue May 06 2008 schwab@suse.de - Don't use libtool before it is created. * Mon May 05 2008 sbrabec@suse.cz ++++++ baselibs.conf ++++++ --- GNOME/glib2/baselibs.conf 2008-04-29 17:15:03.000000000 +0200 +++ glib2/baselibs.conf 2008-05-11 11:50:17.569830000 +0200 @@ -1,6 +1,7 @@ glib2 libglib-2_0-0 - obsoletes "glib2-<targettype>" + obsoletes "glib2-<targettype> <= <version>" + provides "glib2-<targettype> = <version>" libgmodule-2_0-0 libgio-2_0-0 libgthread-2_0-0 ++++++ glib2-base64.patch ++++++ Index: glib/gbase64.c =================================================================== --- glib/gbase64.c (revision 6755) +++ glib/gbase64.c (working copy) @@ -368,7 +368,7 @@ g_base64_decode (const gchar *text, g_return_val_if_fail (input_length > 1, NULL); - ret = g_malloc0 (input_length * 3 / 4); + ret = g_malloc0 (input_length * 3 / 4 + 4); *out_len = g_base64_decode_step (text, input_length, ret, &state, &save); ++++++ glib2-bnc379739-handle-blank-tryexec.patch ++++++ --- glib-2.16.3-pre/gio/gdesktopappinfo.c 2008-05-13 16:21:51.000000000 -0500 +++ glib-2.16.3-work/gio/gdesktopappinfo.c 2008-05-13 16:22:49.000000000 -0500 @@ -236,7 +236,7 @@ g_desktop_app_info_new_from_filename (co G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_TRY_EXEC, NULL); - if (try_exec) + if (try_exec && try_exec [0] != '\0') { char *t; t = g_find_program_in_path (try_exec); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org