rpms/gnome-keyring/F-11 gnome-keyring-2.28.2-autostart_remove_onlyshowin.patch, NONE, 1.1 gnome-keyring.spec, 1.124, 1.125

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/gnome-keyring/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24582

Modified Files:
	gnome-keyring.spec 
Added Files:
	gnome-keyring-2.28.2-autostart_remove_onlyshowin.patch 
Log Message:
* Mon Jan 04 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.26.3-2
- pam_gnome_keyring.so doesn't initialize properly on != gnome (#453880)
- hack out %_libdir rpaths


gnome-keyring-2.28.2-autostart_remove_onlyshowin.patch:
 gnome-keyring-daemon.desktop.in    |    1 -
 gnome-keyring-daemon.desktop.in.in |    1 -
 2 files changed, 2 deletions(-)

--- NEW FILE gnome-keyring-2.28.2-autostart_remove_onlyshowin.patch ---
diff -up gnome-keyring-2.28.2/daemon/gnome-keyring-daemon.desktop.in.in.OnlyShowIn gnome-keyring-2.28.2/daemon/gnome-keyring-daemon.desktop.in.in
--- gnome-keyring-2.28.2/daemon/gnome-keyring-daemon.desktop.in.in.OnlyShowIn	2009-04-17 21:51:49.000000000 -0500
+++ gnome-keyring-2.28.2/daemon/gnome-keyring-daemon.desktop.in.in	2010-01-04 11:37:19.726652487 -0600
@@ -2,7 +2,6 @@
 Type=Application
 _Name=GNOME Keyring Daemon
 Exec=@VALGRIND_RUN@ gnome-keyring-daemon --start
-OnlyShowIn=GNOME;
 X-GNOME-Autostart-Phase=Initialization
 X-GNOME-AutoRestart=false
 X-GNOME-Autostart-Notify=true
diff -up gnome-keyring-2.28.2/daemon/gnome-keyring-daemon.desktop.in.OnlyShowIn gnome-keyring-2.28.2/daemon/gnome-keyring-daemon.desktop.in
--- gnome-keyring-2.28.2/daemon/gnome-keyring-daemon.desktop.in.OnlyShowIn	2009-12-14 08:42:13.000000000 -0600
+++ gnome-keyring-2.28.2/daemon/gnome-keyring-daemon.desktop.in	2010-01-04 11:37:26.233651799 -0600
@@ -2,7 +2,6 @@
 Type=Application
 _Name=GNOME Keyring Daemon
 Exec= gnome-keyring-daemon --start
-OnlyShowIn=GNOME;
 X-GNOME-Autostart-Phase=Initialization
 X-GNOME-AutoRestart=false
 X-GNOME-Autostart-Notify=true


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/F-11/gnome-keyring.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- gnome-keyring.spec	30 Jun 2009 23:34:50 -0000	1.124
+++ gnome-keyring.spec	4 Jan 2010 20:31:41 -0000	1.125
@@ -8,13 +8,16 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 2.26.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.26/gnome-keyring-%{version}.tar.bz2
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# http://bugzilla.redhat.com/453880
+Patch4: gnome-keyring-2.28.2-autostart_remove_onlyshowin.patch
+
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: GConf2-devel
@@ -66,6 +69,13 @@ automatically unlock the "login" keyring
 %prep
 %setup -q -n gnome-keyring-%{version}
 
+%patch4 -p1 -b .autostart_remove_onlyshowin
+
+# hack to nuke rpaths
+%if "%{_libdir}" != "/usr/lib"
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+%endif
+
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
 
@@ -142,6 +152,10 @@ fi
 
 
 %changelog
+* Mon Jan 04 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.26.3-2
+- pam_gnome_keyring.so doesn't initialize properly on != gnome (#453880)
+- hack out %%_libdir rpaths
+
 * Tue Jun 30 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.3-1
 - Update to 2.26.3
 - See http://download.gnome.org/sources/gnome-keyring/2.26/gnome-keyring-2.26.3.news