rpms/gnome-keyring/F-12 gnome-keyring-2.28.2-autostart_remove_onlyshowin.patch, NONE, 1.1 gnome-keyring.spec, 1.136, 1.137

[Rex Dieter]

Author: rdieter

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

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.28.2-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-12/gnome-keyring.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- gnome-keyring.spec	16 Dec 2009 14:05:44 -0000	1.136
+++ gnome-keyring.spec	4 Jan 2010 20:31:05 -0000	1.137
@@ -8,7 +8,7 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 2.28.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.28/gnome-keyring-%{version}.tar.bz2
@@ -20,6 +20,9 @@ Patch2: gnome-keyring-2.28.0-die-on-sess
 # http://bugs.gnome.org/598494
 Patch3: gnome-keyring-2.28.1-nopass.patch
 
+# http://bugzilla.redhat.com/453880
+Patch4: gnome-keyring-2.28.2-autostart_remove_onlyshowin.patch 
+
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -74,6 +77,12 @@ automatically unlock the "login" keyring
 %setup -q -n gnome-keyring-%{version}
 %patch2 -p1 -b .die-on-session-exit
 %patch3 -p1 -b .no-pass
+%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
@@ -151,6 +160,10 @@ fi
 
 
 %changelog
+* Mon Jan 04 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.28.2-2
+- pam_gnome_keyring.so doesn't initialize properly on != gnome (#453880)
+- hack out %%_libdir rpaths
+
 * Wed Dec 16 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.2-1
 - Update to 2.28.2