Hello community, here is the log from the commit of package gnome-keyring checked in at Fri Sep 14 00:42:12 CEST 2007. -------- --- GNOME/gnome-keyring/gnome-keyring.changes 2007-08-27 19:22:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-keyring/gnome-keyring.changes 2007-09-10 20:00:41.930931000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 10 19:58:49 CEST 2007 - crivera@suse.de + +- Add a patch to fix Bug #186189. We only start gnome-keyring + daemon if the WINDOWMANAGER environment variable is set to + /usr/bin/gnome. + +------------------------------------------------------------------- New: ---- gnome-keyring-check-session.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-keyring.spec ++++++ --- /var/tmp/diff_new_pack.Ni4920/_old 2007-09-14 00:42:01.000000000 +0200 +++ /var/tmp/diff_new_pack.Ni4920/_new 2007-09-14 00:42:01.000000000 +0200 @@ -14,8 +14,8 @@ #BuildRequires: CASA-devel BuildRequires: fdupes gtk-doc gtk2-devel intltool libgcrypt-devel pam-devel update-desktop-files Version: 2.19.91 -Release: 1 -URL: http://www.gnome.org/ +Release: 9 +Url: http://www.gnome.org/ Group: System/GUI/GNOME License: GPL v2 or later, LGPL v2 or later Summary: GNOME Keyring Password Manager @@ -23,8 +23,9 @@ Patch1: gnome-keyring-use-markup-correctly.patch # FIXME: This patch needs to be redone! Patch3: gnome-keyring-0.4.6-casa-integration.patch +Patch4: gnome-keyring-check-session.patch Requires: %{name}-lang = %{version} -Autoreqprov: on +AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -97,6 +98,7 @@ %setup -q %patch1 ### %patch3 -p1 +%patch4 -p1 %build autoreconf -f -i @@ -110,7 +112,6 @@ %install make DESTDIR=$RPM_BUILD_ROOT install install-pam %find_lang %{name} - %fdupes $RPM_BUILD_ROOT %clean @@ -170,6 +171,10 @@ %{_datadir}/gtk-doc/html/gnome-keyring %changelog +* Mon Sep 10 2007 - crivera@suse.de +- Add a patch to fix Bug #186189. We only start gnome-keyring + daemon if the WINDOWMANAGER environment variable is set to + /usr/bin/gnome. * Mon Aug 27 2007 - cgaisford@novell.com - Updated to 2.19.91 to incorporate needed fixes for Novell bugs: 298975, 299730, 299621, 304189 ++++++ gnome-keyring-check-session.patch ++++++ diff -ur /usr/src/packages/BUILD/gnome-keyring-2.19.91/pam/gkr-pam-module.c ./pam/gkr-pam-module.c --- /usr/src/packages/BUILD/gnome-keyring-2.19.91/pam/gkr-pam-module.c 2007-08-24 16:29:53.000000000 -0400 +++ ./pam/gkr-pam-module.c 2007-09-10 12:07:04.000000000 -0400 @@ -727,9 +727,12 @@ } } - /* Should we start the daemon? */ if (args & ARG_AUTO_START) { + /* we don't start the keyring if we're not starting a gnome-session */ + if (strncmp (getenv ("WINDOWMANAGER"), "/usr/bin/gnome", 14)) + return PAM_SUCCESS; + ret = start_daemon_if_necessary (ph, pwd); if (ret != PAM_SUCCESS) return ret; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org