Hello community, here is the log from the commit of package gnome-keyring for openSUSE:Factory checked in at Thu Feb 12 15:39:06 CET 2009. -------- --- GNOME/gnome-keyring/gnome-keyring.changes 2009-02-01 05:51:26.000000000 +0100 +++ gnome-keyring/gnome-keyring.changes 2009-02-03 01:30:46.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Feb 3 11:16:53 EST 2009 - mboman@suse.de + +- Update to version 2.25.90: + + Add certificate UI bit to gcr library. + + Can now again clear the cached authentication from an SSH key. + + Add some additional helper functions to gp11 library. + + Fix some corner cases in signal handling. + + Don't crash when trying to lock keyrings that don't have a + password. + + Fix problems running on 64-bit systems. + + Build fixes +- Tag/Rename/Upstream + gnome-keyring-bgo570295-use-markup-correctly.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-keyring-2.25.5.tar.bz2 gnome-keyring-use-markup-correctly.patch New: ---- gnome-keyring-2.25.90.tar.bz2 gnome-keyring-bgo570295-use-markup-correctly.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-keyring.spec ++++++ --- /var/tmp/diff_new_pack.L28007/_old 2009-02-12 15:37:20.000000000 +0100 +++ /var/tmp/diff_new_pack.L28007/_new 2009-02-12 15:37:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gnome-keyring (Version 2.25.5) +# spec file for package gnome-keyring (Version 2.25.90) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,7 +22,6 @@ BuildRequires: dbus-1-devel BuildRequires: fdupes BuildRequires: gconf2-devel -BuildRequires: gtk-doc BuildRequires: gtk2-devel BuildRequires: hal-devel BuildRequires: intltool @@ -30,14 +29,15 @@ BuildRequires: libtasn1-devel BuildRequires: pam-devel BuildRequires: update-desktop-files -Version: 2.25.5 +Version: 2.25.90 Release: 1 Url: http://www.gnome.org/ Group: System/GUI/GNOME License: GPL v2 or later; LGPL v2.1 or later Summary: GNOME Keyring Password Manager Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.6/%{name}-%{version}.tar.bz2 -Patch1: gnome-keyring-use-markup-correctly.patch +# PATCH-FIX-UPSTREAM gnome-keyring-bgo570295-use-markup-correctly.patch bgo570295 joeshaw@suse.de -- Escape markup correctly +Patch1: gnome-keyring-bgo570295-use-markup-correctly.patch # PATCH-FEATURE-UPSTREAM gnome-keyring-pam-auto-start-if.patch bnc421603 bgo559781 vuntz@novell.com -- Add auto_start_if= option to the pam module Patch3: gnome-keyring-pam-auto-start-if.patch # PATCH-FIX-OPENSUSE gnome-keyring-check-session.patch vuntz@novell.com -- Only start gnome-keyring in the pam module if GNOME is started @@ -148,11 +148,6 @@ %{__rm} -f %{buildroot}%{_libdir}/*.la %{__rm} -f %{buildroot}/%{_lib}/security/*.la cat %{name}.schemas_list > %{name}.lst -# Temporary workaround to not have to own /usr/share/gnome/autostart. Upstream -# will move the file in the right directory. -install -d %{buildroot}%{_sysconfdir}/xdg/autostart -mv %{buildroot}%{_datadir}/gnome/autostart/gnome-keyring-daemon.desktop %{buildroot}%{_sysconfdir}/xdg/autostart -# end of workaround %suse_update_desktop_file gnome-keyring-daemon %clean @@ -202,6 +197,8 @@ %{_datadir}/dbus-1/services/org.gnome.keyring.service %{_datadir}/gtk-doc/html/gp11 %{_sysconfdir}/xdg/autostart/*.desktop +%{_datadir}/gcr +%{_datadir}/gcr/ui %files lang -f %{name}.lang @@ -218,8 +215,23 @@ %files doc %defattr (-, root, root) %{_datadir}/gtk-doc/html/gnome-keyring +# Own these repositories to not depend on gtk-doc while building: +%dir %{_datadir}/gtk-doc +%dir %{_datadir}/gtk-doc/html %changelog +* Tue Feb 03 2009 mboman@suse.de +- Update to version 2.25.90: + + Add certificate UI bit to gcr library. + + Can now again clear the cached authentication from an SSH key. + + Add some additional helper functions to gp11 library. + + Fix some corner cases in signal handling. + + Don't crash when trying to lock keyrings that don't have a + password. + + Fix problems running on 64-bit systems. + + Build fixes +- Tag/Rename/Upstream + gnome-keyring-bgo570295-use-markup-correctly.patch * Sun Feb 01 2009 mboman@suse.de - Update to version 2.25.5: + Refactor out gcr library for crypto UI and related tasks. ++++++ gnome-keyring-2.25.5.tar.bz2 -> gnome-keyring-2.25.90.tar.bz2 ++++++ ++++ 34271 lines of diff (skipped) ++++++ gnome-keyring-bgo570295-use-markup-correctly.patch ++++++ === modified file 'ui/gkr-ask-tool.c' --- daemon/ui/gkr-ask-tool.c 2007-12-20 17:59:15 +0000 +++ daemon/ui/gkr-ask-tool.c 2007-12-20 17:59:37 +0000 @@ -56,8 +56,9 @@ create_markup (const gchar *primary, const gchar *secondary) { /* We're passed markup for both of these */ - return g_strdup_printf ("%s</span>\n\n%s", - primary, secondary ? secondary : ""); + return g_markup_printf_escaped ("%s</span>\n\n%s", + primary, secondary ? secondary : ""); + } static gchar* @@ -282,9 +283,12 @@ g_free (value); g_free (value2); - message_widget = GTK_LABEL (gtk_label_new (message)); + /* message_widget = GTK_LABEL (gtk_label_new (message)); */ + message_widget = GTK_LABEL (gtk_label_new (NULL)); + gtk_label_set_use_markup (message_widget, TRUE); + gtk_label_set_markup (message_widget, message); g_free (message); - gtk_label_set_use_markup (message_widget, TRUE); + /* gtk_label_set_use_markup (message_widget, TRUE); */ gtk_misc_set_alignment (GTK_MISC (message_widget), 0.0, 0.5); gtk_label_set_line_wrap (message_widget, TRUE); gtk_label_set_justify (message_widget, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org